This repository has been archived by the owner on Mar 20, 2019. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
gcarq
committed
Jul 29, 2015
1 parent
83617e6
commit a521648
Showing
12 changed files
with
1,331 additions
and
0 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
--- ./chrome/common/chrome_paths_linux.cc | ||
+++ ./chrome/common/chrome_paths_linux.cc.new | ||
@@ -64,11 +64,7 @@ | ||
base::FilePath config_dir(GetXDGDirectory(env.get(), | ||
kXdgConfigHomeEnvVar, | ||
kDotConfigDir)); | ||
-#if defined(GOOGLE_CHROME_BUILD) | ||
- *result = config_dir.Append("google-chrome"); | ||
-#else | ||
- *result = config_dir.Append("chromium"); | ||
-#endif | ||
+ *result = config_dir.Append("inox"); | ||
return true; | ||
} | ||
|
||
|
||
--- ./chrome/app/chromium_strings.grd | ||
+++ ./chrome/app/chromium_strings.grd.new | ||
@@ -215,17 +215,17 @@ be available for now. --> | ||
Disconnecting <ph name="USERNAME">$1<ex>someone@example.com</ex></ph> will clear your history, bookmarks, settings, and other Chromium data stored on this device. Data stored in your Google Account will not be cleared and can be managed on <ph name="GOOGLE_DASHBOARD_LINK"><a target="_blank" href="$2"></ph>Google Dashboard<ph name="END_GOOGLE_DASHBOARD_LINK"></a></ph>. | ||
</message> | ||
<message name="IDS_PRODUCT_NAME" desc="The Chrome application name"> | ||
- Chromium | ||
+ Inox | ||
</message> | ||
<message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name."> | ||
- Chromium | ||
+ Inox | ||
</message> | ||
<if expr="is_win"> | ||
<message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome short cut name for SxS channel"> | ||
- Chromium | ||
+ Inox | ||
</message> | ||
<message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description"> | ||
- Chromium is a web browser that runs webpages and applications with lightning speed. It's fast, stable, and easy to use. Browse the web more safely with malware and phishing protection built into Chromium. | ||
+ Inox is a free, open, and libre browser modification of the Chromium code base, with privacy being enhanced in several key areas. Automatic transmission of partial queries, keywords, metrics to central services inhibited and only occurs with consent. In addition, all our builds are reproducible, and modifications are auditable, setting the project ahead of other secure browser providers. | ||
</message> | ||
</if> | ||
<if expr="chromeos"> | ||
@@ -241,7 +241,7 @@ be available for now. --> | ||
Chromium App Launcher | ||
</message> | ||
<message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries application name"> | ||
- Chromium Binaries | ||
+ Inox Binaries | ||
</message> | ||
<message name="IDS_CHROME_FRAME_TURNDOWN_LEARN_MORE_URL" desc="Link to knowledge-base article about Chromium Frame's turndown"> | ||
https://support.google.com/chrome/?p=ib_chromeframe | ||
@@ -272,17 +272,17 @@ be available for now. --> | ||
</message> | ||
</if> | ||
<message name="IDS_TASK_MANAGER_TITLE" desc="The title of the Task Manager window"> | ||
- Task Manager - Chromium | ||
+ Task Manager - Inox | ||
</message> | ||
<message name="IDS_SESSION_CRASHED_VIEW_MESSAGE" desc="Message shown when the last session didn't exit cleanly."> | ||
- Chromium didn't shut down correctly. | ||
+ Inox did not shut down correctly. | ||
</message> | ||
<message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble."> | ||
Help make Chromium better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google | ||
</message> | ||
<!-- Browser Window Title Format --> | ||
<message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabs and popup windows"> | ||
- <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Chromium | ||
+ <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> – Inox | ||
</message> | ||
<if expr="not chromeos"> | ||
<message name="IDS_GET_HELP_USING_CHROME" desc="Text of the button which takes the user to the Chrome help page."> | ||
@@ -787,7 +787,7 @@ For Chromium, processes used to display diagnostics information (such as this "a | ||
|
||
<if expr="use_titlecase and not chromeos"> | ||
<message name="IDS_ABOUT" desc="In Title Case: The text label of the About Chrome menu item"> | ||
- About &Chromium | ||
+ About &Inox | ||
</message> | ||
<message name="IDS_UPDATE_NOW" desc="In Title Case: The text label of the Update Chrome Now menu item"> | ||
Update &Chromium | ||
@@ -795,7 +795,7 @@ For Chromium, processes used to display diagnostics information (such as this "a | ||
</if> | ||
<if expr="not use_titlecase and not chromeos"> | ||
<message name="IDS_ABOUT" desc="The text label of the About Chrome menu item"> | ||
- About &Chromium | ||
+ About &Inox | ||
</message> | ||
<message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome Now menu item"> | ||
Update &Chromium | ||
@@ -812,7 +812,7 @@ For Chromium, processes used to display diagnostics information (such as this "a | ||
|
||
<if expr="is_macosx"> | ||
<message name="IDS_APP_MENU_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome."> | ||
- Chromium | ||
+ Inox | ||
</message> | ||
<message name="IDS_HELPER_NAME" desc="The helper application's name. Should contain the Chrome application name (IDS_PRODUCT_NAME). Example: Google Chrome Helper."> | ||
Chromium Helper |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
--- ./components/autofill/core/browser/autofill_download_manager.cc 2015-05-14 00:35:46.000000000 +0200 | ||
+++ ./components/autofill/core/browser/autofill_download_manager.cc.new 2015-07-23 03:58:13.640789314 +0200 | ||
@@ -44,11 +44,6 @@ | ||
return std::string(); | ||
} | ||
|
||
-GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) { | ||
- return GURL("https://clients1.google.com/tbproxy/af/" + | ||
- RequestTypeToString(request_type) + "?client=" + kClientName); | ||
-} | ||
- | ||
} // namespace | ||
|
||
struct AutofillDownloadManager::FormRequestData { | ||
@@ -170,28 +165,6 @@ | ||
bool AutofillDownloadManager::StartRequest( | ||
const std::string& form_xml, | ||
const FormRequestData& request_data) { | ||
- net::URLRequestContextGetter* request_context = | ||
- driver_->GetURLRequestContext(); | ||
- DCHECK(request_context); | ||
- GURL request_url = GetRequestUrl(request_data.request_type); | ||
- | ||
- // Id is ignored for regular chrome, in unit test id's for fake fetcher | ||
- // factory will be 0, 1, 2, ... | ||
- net::URLFetcher* fetcher = | ||
- net::URLFetcher::Create(fetcher_id_for_unittest_++, request_url, | ||
- net::URLFetcher::POST, this).release(); | ||
- url_fetchers_[fetcher] = request_data; | ||
- fetcher->SetAutomaticallyRetryOn5xx(false); | ||
- fetcher->SetRequestContext(request_context); | ||
- fetcher->SetUploadData("text/plain", form_xml); | ||
- fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES | | ||
- net::LOAD_DO_NOT_SEND_COOKIES); | ||
- fetcher->Start(); | ||
- | ||
- VLOG(1) << "Sending AutofillDownloadManager " | ||
- << RequestTypeToString(request_data.request_type) | ||
- << " request: " << form_xml; | ||
- | ||
return true; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,188 @@ | ||
--- ./chrome/browser/extensions/external_component_loader.cc | ||
+++ ./chrome/browser/extensions/external_component_loader.cc.new | ||
@@ -37,67 +37,11 @@ | ||
|
||
// static | ||
bool ExternalComponentLoader::IsModifiable(const Extension* extension) { | ||
- if (extension->location() == Manifest::EXTERNAL_COMPONENT) { | ||
- static const char* const kEnhancedExtensions[] = { | ||
- "D5736E4B5CF695CB93A2FB57E4FDC6E5AFAB6FE2", // http://crbug.com/312900 | ||
- "D57DE394F36DC1C3220E7604C575D29C51A6C495", // http://crbug.com/319444 | ||
- "3F65507A3B39259B38C8173C6FFA3D12DF64CCE9" // http://crbug.com/371562 | ||
- }; | ||
- return SimpleFeature::IsIdInArray( | ||
- extension->id(), kEnhancedExtensions, arraysize(kEnhancedExtensions)); | ||
- } | ||
- return false; | ||
+ | ||
} | ||
|
||
void ExternalComponentLoader::StartLoading() { | ||
prefs_.reset(new base::DictionaryValue()); | ||
- std::string app_id = extension_misc::kInAppPaymentsSupportAppId; | ||
- prefs_->SetString(app_id + ".external_update_url", | ||
- extension_urls::GetWebstoreUpdateUrl().spec()); | ||
- | ||
- if (HotwordServiceFactory::IsHotwordAllowed(profile_)) { | ||
- std::string hotword_id = extension_misc::kHotwordSharedModuleId; | ||
- prefs_->SetString(hotword_id + ".external_update_url", | ||
- extension_urls::GetWebstoreUpdateUrl().spec()); | ||
- } | ||
- | ||
- { | ||
- std::string extension_id; | ||
- if (IsEnhancedBookmarksEnabled(&extension_id)) { | ||
- prefs_->SetString(extension_id + ".external_update_url", | ||
- extension_urls::GetWebstoreUpdateUrl().spec()); | ||
- } | ||
- } | ||
- | ||
-#if defined(OS_CHROMEOS) | ||
- { | ||
- base::CommandLine* const command_line = | ||
- base::CommandLine::ForCurrentProcess(); | ||
- if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker)) { | ||
- const std::string extension_id = extension_misc::kZIPUnpackerExtensionId; | ||
- prefs_->SetString(extension_id + ".external_update_url", | ||
- extension_urls::GetWebstoreUpdateUrl().spec()); | ||
- } | ||
- } | ||
-#endif | ||
- | ||
- | ||
-#if defined(ENABLE_MEDIA_ROUTER) | ||
- if (switches::MediaRouterEnabled()) { | ||
- std::string media_router_extension_id( | ||
- extension_misc::kMediaRouterStableExtensionId); | ||
- prefs_->SetString(media_router_extension_id + ".external_update_url", | ||
- extension_urls::GetWebstoreUpdateUrl().spec()); | ||
- } | ||
-#endif // defined(ENABLE_MEDIA_ROUTER) | ||
- | ||
-#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS) | ||
- std::string google_now_extension_id; | ||
- if (GetGoogleNowExtensionId(&google_now_extension_id)) { | ||
- prefs_->SetString(google_now_extension_id + ".external_update_url", | ||
- extension_urls::GetWebstoreUpdateUrl().spec()); | ||
- } | ||
-#endif | ||
|
||
LoadFinished(); | ||
} | ||
|
||
|
||
|
||
--- ./chrome/browser/extensions/component_loader.cc | ||
+++ ./chrome/browser/extensions/component_loader.cc.new | ||
@@ -327,24 +327,12 @@ | ||
} | ||
|
||
void ComponentLoader::AddHangoutServicesExtension() { | ||
-#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION) | ||
- Add(IDR_HANGOUT_SERVICES_MANIFEST, | ||
- base::FilePath(FILE_PATH_LITERAL("hangout_services"))); | ||
-#endif | ||
} | ||
|
||
void ComponentLoader::AddHotwordAudioVerificationApp() { | ||
- if (HotwordServiceFactory::IsAlwaysOnAvailable()) { | ||
- Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST, | ||
- base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification"))); | ||
- } | ||
} | ||
|
||
void ComponentLoader::AddHotwordHelperExtension() { | ||
- if (HotwordServiceFactory::IsHotwordAllowed(browser_context_)) { | ||
- Add(IDR_HOTWORD_MANIFEST, | ||
- base::FilePath(FILE_PATH_LITERAL("hotword"))); | ||
- } | ||
} | ||
|
||
void ComponentLoader::AddImageLoaderExtension() { | ||
@@ -355,8 +343,6 @@ | ||
} | ||
|
||
void ComponentLoader::AddNetworkSpeechSynthesisExtension() { | ||
- Add(IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST, | ||
- base::FilePath(FILE_PATH_LITERAL("network_speech_synthesis"))); | ||
} | ||
|
||
#if defined(OS_CHROMEOS) | ||
@@ -442,15 +428,6 @@ | ||
} | ||
|
||
void ComponentLoader::AddWebStoreApp() { | ||
-#if defined(OS_CHROMEOS) | ||
- if (!IsNormalSession()) | ||
- return; | ||
-#endif | ||
- | ||
- AddWithNameAndDescription(IDR_WEBSTORE_MANIFEST, | ||
- base::FilePath(FILE_PATH_LITERAL("web_store")), | ||
- IDS_WEBSTORE_NAME_STORE, | ||
- IDS_WEBSTORE_APP_DESCRIPTION); | ||
} | ||
|
||
// static | ||
@@ -488,9 +465,6 @@ | ||
DCHECK(!skip_session_components); | ||
Add(IDR_BOOKMARKS_MANIFEST, | ||
base::FilePath(FILE_PATH_LITERAL("bookmark_manager"))); | ||
- // Cloud Print component app. Not required on Chrome OS. | ||
- Add(IDR_CLOUDPRINT_MANIFEST, | ||
- base::FilePath(FILE_PATH_LITERAL("cloud_print"))); | ||
#endif | ||
|
||
if (!skip_session_components) { | ||
@@ -550,13 +524,6 @@ | ||
AddHotwordHelperExtension(); | ||
AddImageLoaderExtension(); | ||
|
||
- bool install_feedback = enable_background_extensions_during_testing; | ||
-#if defined(GOOGLE_CHROME_BUILD) | ||
- install_feedback = true; | ||
-#endif // defined(GOOGLE_CHROME_BUILD) | ||
- if (install_feedback) | ||
- Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback"))); | ||
- | ||
#if defined(ENABLE_SETTINGS_APP) | ||
Add(IDR_SETTINGS_APP_MANIFEST, | ||
base::FilePath(FILE_PATH_LITERAL("settings_app"))); | ||
@@ -601,36 +568,6 @@ | ||
} | ||
#endif // defined(OS_CHROMEOS) | ||
|
||
-#if defined(ENABLE_GOOGLE_NOW) | ||
- const char kEnablePrefix[] = "Enable"; | ||
- const char kFieldTrialName[] = "GoogleNow"; | ||
- std::string enable_prefix(kEnablePrefix); | ||
- std::string field_trial_result = | ||
- base::FieldTrialList::FindFullName(kFieldTrialName); | ||
- | ||
- bool enabled_via_field_trial = | ||
- field_trial_result.compare(0, enable_prefix.length(), enable_prefix) == 0; | ||
- | ||
- // Enable the feature on trybots and trunk builds. | ||
- bool enabled_via_trunk_build = | ||
- chrome::VersionInfo::GetChannel() == chrome::VersionInfo::CHANNEL_UNKNOWN; | ||
- | ||
- bool enabled = enabled_via_field_trial || enabled_via_trunk_build; | ||
- | ||
-#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS) | ||
- // Don't load if newer trial is running (== new extension id is available). | ||
- std::string ignored_extension_id; | ||
- if (GetGoogleNowExtensionId(&ignored_extension_id)) { | ||
- enabled = false; | ||
- } | ||
-#endif | ||
- | ||
- if (!skip_session_components && enabled) { | ||
- Add(IDR_GOOGLE_NOW_MANIFEST, | ||
- base::FilePath(FILE_PATH_LITERAL("google_now"))); | ||
- } | ||
-#endif | ||
- | ||
#if defined(GOOGLE_CHROME_BUILD) | ||
#if !defined(OS_CHROMEOS) // http://crbug.com/314799 | ||
AddNetworkSpeechSynthesisExtension(); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
--- ./components/gcm_driver/gcm_channel_status_request.cc | ||
+++ ./components/gcm_driver/gcm_channel_status_request.cc.new | ||
@@ -19,8 +19,10 @@ namespace gcm { | ||
|
||
namespace { | ||
|
||
+#if 0 | ||
const char kRequestContentType[] = "application/octet-stream"; | ||
const char kGCMChannelTag[] = "gcm_channel"; | ||
+#endif | ||
const int kDefaultPollIntervalSeconds = 60 * 60; // 60 minutes. | ||
const int kMinPollIntervalSeconds = 30 * 60; // 30 minutes. | ||
|
||
@@ -53,6 +55,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() { | ||
} | ||
|
||
void GCMChannelStatusRequest::Start() { | ||
+#if 0 | ||
DCHECK(!url_fetcher_.get()); | ||
|
||
GURL request_url(channel_status_request_url_); | ||
@@ -72,6 +75,9 @@ void GCMChannelStatusRequest::Start() { | ||
url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | | ||
net::LOAD_DO_NOT_SAVE_COOKIES); | ||
url_fetcher_->Start(); | ||
+#endif | ||
+ // Simulate an empty response and disable GCM. | ||
+ callback_.Run(false, false, 0); | ||
} | ||
|
||
void GCMChannelStatusRequest::OnURLFetchComplete( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
--- ./net/dns/host_resolver_impl.cc | ||
+++ ./net/dns/host_resolver_impl.cc.new | ||
@@ -78,10 +78,10 @@ const char kLocalhost[] = "localhost."; | ||
// cached. | ||
const int kIPv6ProbePeriodMs = 1000; | ||
|
||
-// Google DNS address used for IPv6 probes. | ||
+/* RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted) */ | ||
const uint8_t kIPv6ProbeAddress[] = | ||
- { 0x20, 0x01, 0x48, 0x60, 0x48, 0x60, 0x00, 0x00, | ||
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88 }; | ||
+ { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00, | ||
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }; | ||
|
||
// We use a separate histogram name for each platform to facilitate the | ||
// display of error codes by their symbolic name (since each platform has | ||
|
Oops, something went wrong.