From e6148baf40d37385e490272d848486642d5dfd37 Mon Sep 17 00:00:00 2001 From: Eloston Date: Mon, 7 Dec 2015 21:48:25 -0800 Subject: [PATCH] Removed unwanted Iridium patches Removed duplicate patches from Inox patchset and Debian patches Updated patch_order --- .../debian/disable/external-components.patch | 12 - .../debian/disable/third-party-cookies.patch | 14 - patches/debian/manpage.patch | 53 - patches/debian/master-preferences.patch | 17 - patches/debian/system/clang.patch | 16 - patches/debian/system/ffmpeg.patch | 197 - patches/debian/system/nspr.patch | 36 - patches/debian/system/snappy.patch | 64 - .../add-duckduckgo-search-engine.patch | 585 -- patches/inox-patchset/branding.patch | 100 - .../inox-patchset/chromium-sandbox-pie.patch | 14 - .../disable-default-extensions.patch | 16 +- .../disable-gcm-status-check.patch | 32 - .../disable-google-ipv6-probes.patch | 17 - .../disable-google-url-tracker.patch | 6 +- .../disable-missing-key-warning.patch | 10 - .../disable-notification-promo-fetch.patch | 36 - .../disable-translation-lang-fetch.patch | 39 - .../inox-patchset/disable-update-pings.patch | 17 - patches/inox-patchset/launcher-branding.patch | 33 - .../inox-patchset/modify-default-prefs.patch | 154 - ...fix-OSX-branded-build-crashes-on-OSX.patch | 64 - ...um-version-and-change-User-Agent-acc.patch | 103 - ...ficate-pinning-for-iridiumbrowser.de.patch | 5231 ----------------- ...ed-copy-of-plugin-description-list-a.patch | 32 - ...fs-use-separate-directory-for-config.patch | 30 - ...-system-provided-preference-skeleton.patch | 32 - ...arch-show-blank-tab-for-new-tab-page.patch | 53 - ...dd-DuckDuckGo-as-selectable-and-defa.patch | 610 -- ...dd-Qwant-as-selectable-and-default-s.patch | 602 -- ...c-add-comments-for-evil-looking-code.patch | 43 - ...opy-of-safebrowsing-lists-at-iridium.patch | 29 - ...pdate-strings-to-read-Iridium-instea.patch | 1136 ---- patches/patch_order | 62 + 34 files changed, 66 insertions(+), 9429 deletions(-) delete mode 100644 patches/debian/disable/external-components.patch delete mode 100644 patches/debian/disable/third-party-cookies.patch delete mode 100644 patches/debian/manpage.patch delete mode 100644 patches/debian/master-preferences.patch delete mode 100644 patches/debian/system/clang.patch delete mode 100644 patches/debian/system/ffmpeg.patch delete mode 100644 patches/debian/system/nspr.patch delete mode 100644 patches/debian/system/snappy.patch delete mode 100644 patches/inox-patchset/add-duckduckgo-search-engine.patch delete mode 100644 patches/inox-patchset/branding.patch delete mode 100644 patches/inox-patchset/chromium-sandbox-pie.patch delete mode 100644 patches/inox-patchset/disable-gcm-status-check.patch delete mode 100644 patches/inox-patchset/disable-google-ipv6-probes.patch delete mode 100644 patches/inox-patchset/disable-missing-key-warning.patch delete mode 100644 patches/inox-patchset/disable-notification-promo-fetch.patch delete mode 100644 patches/inox-patchset/disable-update-pings.patch delete mode 100644 patches/inox-patchset/launcher-branding.patch delete mode 100644 patches/iridium-browser/build-fix-OSX-branded-build-crashes-on-OSX.patch delete mode 100644 patches/iridium-browser/common-set-Iridium-version-and-change-User-Agent-acc.patch delete mode 100644 patches/iridium-browser/http-certificate-pinning-for-iridiumbrowser.de.patch delete mode 100644 patches/iridium-browser/plugins-use-cached-copy-of-plugin-description-list-a.patch delete mode 100644 patches/iridium-browser/prefs-use-separate-directory-for-config.patch delete mode 100644 patches/iridium-browser/prefs-use-system-provided-preference-skeleton.patch delete mode 100644 patches/iridium-browser/search-show-blank-tab-for-new-tab-page.patch delete mode 100644 patches/iridium-browser/search_engines-add-DuckDuckGo-as-selectable-and-defa.patch delete mode 100644 patches/iridium-browser/search_engines-add-Qwant-as-selectable-and-default-s.patch delete mode 100644 patches/iridium-browser/src-add-comments-for-evil-looking-code.patch delete mode 100644 patches/iridium-browser/src-use-cached-copy-of-safebrowsing-lists-at-iridium.patch delete mode 100644 patches/iridium-browser/ui-translation-update-strings-to-read-Iridium-instea.patch diff --git a/patches/debian/disable/external-components.patch b/patches/debian/disable/external-components.patch deleted file mode 100644 index 4782ac5d..00000000 --- a/patches/debian/disable/external-components.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/chrome/browser/extensions/external_component_loader.cc -+++ b/chrome/browser/extensions/external_component_loader.cc -@@ -35,6 +35,9 @@ ExternalComponentLoader::~ExternalCompon - - void ExternalComponentLoader::StartLoading() { - prefs_.reset(new base::DictionaryValue()); -+ LoadFinished(); -+ return; -+ - AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId); - - if (HotwordServiceFactory::IsHotwordAllowed(profile_)) diff --git a/patches/debian/disable/third-party-cookies.patch b/patches/debian/disable/third-party-cookies.patch deleted file mode 100644 index 3b0b7600..00000000 --- a/patches/debian/disable/third-party-cookies.patch +++ /dev/null @@ -1,14 +0,0 @@ -description: disable third-party cookies by default -author: Chad Miller - ---- a/components/content_settings/core/browser/cookie_settings.cc -+++ b/components/content_settings/core/browser/cookie_settings.cc -@@ -82,7 +82,7 @@ void CookieSettings::GetCookieSettings( - void CookieSettings::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref( -- prefs::kBlockThirdPartyCookies, false, -+ prefs::kBlockThirdPartyCookies, true, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - } - diff --git a/patches/debian/manpage.patch b/patches/debian/manpage.patch deleted file mode 100644 index da4008d1..00000000 --- a/patches/debian/manpage.patch +++ /dev/null @@ -1,53 +0,0 @@ -Description: manpage updates/fixes -Forwarded: http://code.google.com/p/chromium/issues/detail?id=73591 -Author: Daniel Echeverry - ---- a/chrome/app/resources/manpage.1.in -+++ b/chrome/app/resources/manpage.1.in -@@ -1,5 +1,5 @@ --." This file is processed by chrome.gyp to generate manpages in the --." build diretory. -+.\" This file is processed by chrome.gyp to generate manpages in the -+.\" build diretory. - .TH @@FILENAME@@ 1 "" "" "USER COMMANDS" - - .SH NAME -@@ -20,6 +20,19 @@ This manpage only describes invocation, - @@NAME@@ has hundreds of undocumented command-line flags that are added - and removed at the whim of the developers. Here, we document relatively - stable flags. -+ -+.TP -+\fB\-h \fRor\fB \-\-help\fR -+Show help output. -+ -+.TP -+\fB\-g \fRor\fB \-\-debug\fR -+Start a debugging session within /usr/bin/gdb. -+ -+.TP -+\fB\-\-temp-profile\fR -+Use a throw-away/temporary profile for this session. -+ - .TP - \fB\-\-user\-data\-dir\fR=\fIDIR\fR - Specifies the directory that user data (your "profile") is kept in. -@@ -110,6 +123,7 @@ as - See the GTK documentation for more: - .IP - -+.IP - - - .SH ENVIRONMENT ---- a/chrome/chrome_exe.gypi -+++ b/chrome/chrome_exe.gypi -@@ -128,7 +128,7 @@ - }, { # else branding!="Chrome" - 'variables': { - 'name': 'Chromium', -- 'filename': 'chromium-browser', -+ 'filename': 'chromium', - 'confdir': 'chromium', - }, - }], diff --git a/patches/debian/master-preferences.patch b/patches/debian/master-preferences.patch deleted file mode 100644 index 6296fb8f..00000000 --- a/patches/debian/master-preferences.patch +++ /dev/null @@ -1,17 +0,0 @@ -description: search for master_preferences in /usr/share/chromium - ---- a/chrome/browser/first_run/first_run_internal_linux.cc -+++ b/chrome/browser/first_run/first_run_internal_linux.cc -@@ -18,11 +18,7 @@ bool IsOrganicFirstRun() { - } - - base::FilePath MasterPrefsPath() { -- // The standard location of the master prefs is next to the chrome binary. -- base::FilePath master_prefs; -- if (!PathService::Get(base::DIR_EXE, &master_prefs)) -- return base::FilePath(); -- return master_prefs.AppendASCII(installer::kDefaultMasterPrefs); -+ return base::FilePath("/usr/share/chromium"); - } - - } // namespace internal diff --git a/patches/debian/system/clang.patch b/patches/debian/system/clang.patch deleted file mode 100644 index cc4c3bf7..00000000 --- a/patches/debian/system/clang.patch +++ /dev/null @@ -1,16 +0,0 @@ -description: use system clang compilers -author: Michael Gilbert - ---- a/build/common.gypi -+++ b/build/common.gypi -@@ -5954,8 +5954,8 @@ - ['clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) ' - 'and OS!="win"', { - 'make_global_settings': [ -- ['CC', '<(make_clang_dir)/bin/clang'], -- ['CXX', '<(make_clang_dir)/bin/clang++'], -+ ['CC', '/usr/bin/clang'], -+ ['CXX', '/usr/bin/clang++'], - ['CC.host', '$(CC)'], - ['CXX.host', '$(CXX)'], - ], diff --git a/patches/debian/system/ffmpeg.patch b/patches/debian/system/ffmpeg.patch deleted file mode 100644 index adb366d9..00000000 --- a/patches/debian/system/ffmpeg.patch +++ /dev/null @@ -1,197 +0,0 @@ -Description: Don't change the FFmpeg ABI in chromium ... - ... because it breaks ABI compatibility with the system FFmpeg. - And don't use private API, which can change at any time. - -Author: Andreas Cadhalpun -Last-Update: <2015-07-26> - ---- a/media/ffmpeg/ffmpeg_common.h -+++ b/media/ffmpeg/ffmpeg_common.h -@@ -19,20 +19,12 @@ - - // Include FFmpeg header files. - extern "C" { --// Disable deprecated features which result in spammy compile warnings. This --// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp --// file or the headers below will generate different structures. --#define FF_API_PIX_FMT_DESC 0 --#define FF_API_OLD_DECODE_AUDIO 0 --#define FF_API_DESTRUCT_PACKET 0 --#define FF_API_GET_BUFFER 0 - - // Temporarily disable possible loss of data warning. - // TODO(scherkus): fix and upstream the compiler warnings. - MSVC_PUSH_DISABLE_WARNING(4244); - #include - #include --#include - #include - #include - #include ---- a/media/filters/ffmpeg_demuxer.cc -+++ b/media/filters/ffmpeg_demuxer.cc -@@ -1013,24 +1013,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone - // If no estimate is found, the stream entry will be kInfiniteDuration(). - std::vector start_time_estimates(format_context->nb_streams, - kInfiniteDuration()); -- const AVFormatInternal* internal = format_context->internal; -- if (internal && internal->packet_buffer && -- format_context->start_time != static_cast(AV_NOPTS_VALUE)) { -- struct AVPacketList* packet_buffer = internal->packet_buffer; -- while (packet_buffer != internal->packet_buffer_end) { -- DCHECK_LT(static_cast(packet_buffer->pkt.stream_index), -- start_time_estimates.size()); -- const AVStream* stream = -- format_context->streams[packet_buffer->pkt.stream_index]; -- if (packet_buffer->pkt.pts != static_cast(AV_NOPTS_VALUE)) { -- const base::TimeDelta packet_pts = -- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); -- if (packet_pts < start_time_estimates[stream->index]) -- start_time_estimates[stream->index] = packet_pts; -- } -- packet_buffer = packet_buffer->next; -- } -- } - - AVStream* audio_stream = NULL; - AudioDecoderConfig audio_config; ---- a/build/all.gyp -+++ b/build/all.gyp -@@ -135,7 +135,7 @@ - '../third_party/WebKit/public/all.gyp:*', - '../third_party/cacheinvalidation/cacheinvalidation.gyp:*', - '../third_party/codesighs/codesighs.gyp:*', -- '../third_party/ffmpeg/ffmpeg.gyp:*', -+ '../build/linux/unbundle/ffmpeg.gyp:*', - '../third_party/iccjpeg/iccjpeg.gyp:*', - '../third_party/libpng/libpng.gyp:*', - '../third_party/libusb/libusb.gyp:*', ---- a/media/cast/cast_testing.gypi -+++ b/media/cast/cast_testing.gypi -@@ -15,7 +15,7 @@ - 'cast_net', - 'cast_receiver', - '<(DEPTH)/testing/gtest.gyp:gtest', -- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg', - '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv', - '<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', -@@ -223,7 +223,7 @@ - '<(DEPTH)/net/net.gyp:net_test_support', - '<(DEPTH)/media/media.gyp:media', - '<(DEPTH)/testing/gtest.gyp:gtest', -- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg', - '<(DEPTH)/third_party/opus/opus.gyp:opus', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', - ], -@@ -246,7 +246,7 @@ - '<(DEPTH)/net/net.gyp:net_test_support', - '<(DEPTH)/media/media.gyp:media', - '<(DEPTH)/testing/gtest.gyp:gtest', -- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg', - '<(DEPTH)/third_party/opus/opus.gyp:opus', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', - ], -@@ -359,7 +359,7 @@ - '<(DEPTH)/base/base.gyp:test_support_base', - '<(DEPTH)/testing/gmock.gyp:gmock', - '<(DEPTH)/testing/gtest.gyp:gtest', -- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg', - ], - 'sources': [ - 'sender/h264_vt_encoder_unittest.cc', ---- a/media/media.gyp -+++ b/media/media.gyp -@@ -642,7 +642,7 @@ - }], - ['media_use_ffmpeg==1', { - 'dependencies': [ -- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg', - ], - }, { # media_use_ffmpeg==0 - # Exclude the sources that depend on ffmpeg. -@@ -1330,7 +1330,7 @@ - }], - ['media_use_ffmpeg==1', { - 'dependencies': [ -- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg', - ], - }, { # media_use_ffmpeg==0 - 'sources!': [ -@@ -1471,7 +1471,7 @@ - }], - ['media_use_ffmpeg==1', { - 'dependencies': [ -- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg', - ], - }, { # media_use_ffmpeg==0 - 'sources!': [ -@@ -1940,7 +1940,7 @@ - '../base/base.gyp:test_support_base', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', -- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg', - '../ui/gfx/gfx.gyp:gfx_geometry', - 'media', - 'media_test_support', ---- a/media/media_cdm.gypi -+++ b/media/media_cdm.gypi -@@ -38,7 +38,7 @@ - ['media_use_ffmpeg == 1' , { - 'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'], - 'dependencies': [ -- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg', - ], - 'sources': [ - 'cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc', ---- a/third_party/WebKit/Source/core/core.gyp -+++ b/third_party/WebKit/Source/core/core.gyp -@@ -383,7 +383,7 @@ - ], - }, - 'dependencies': [ -- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg', - ], - }], - ['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', { -@@ -399,7 +399,7 @@ - # Windows shared builder needs extra help for linkage - ['OS=="win" and "WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', { - 'export_dependent_settings': [ -- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg', - ], - }], - ], ---- a/third_party/WebKit/Source/platform/blink_platform.gyp -+++ b/third_party/WebKit/Source/platform/blink_platform.gyp -@@ -409,7 +409,7 @@ - '<(DEPTH)/third_party/ffmpeg', - ], - 'dependencies': [ -- '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '<(DEPTH)/build/linux/unbundle/ffmpeg.gyp:ffmpeg', - ], - }], - ['"WTF_USE_WEBAUDIO_OPENMAX_DL_FFT=1" in feature_defines', { ---- a/content/content_tests.gypi -+++ b/content/content_tests.gypi -@@ -1619,7 +1619,7 @@ - }, { - 'dependencies': [ - # Runtime dependencis. -- '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', -+ '../build/linux/unbundle/ffmpeg.gyp:ffmpeg', - '../third_party/mesa/mesa.gyp:osmesa', - ], - }], diff --git a/patches/debian/system/nspr.patch b/patches/debian/system/nspr.patch deleted file mode 100644 index e3ea8447..00000000 --- a/patches/debian/system/nspr.patch +++ /dev/null @@ -1,36 +0,0 @@ -Include system copy of prtime.h - ---- a/base/base.gypi -+++ b/base/base.gypi -@@ -622,8 +622,6 @@ - 'third_party/dmg_fp/g_fmt.cc', - 'third_party/icu/icu_utf.cc', - 'third_party/icu/icu_utf.h', -- 'third_party/nspr/prtime.cc', -- 'third_party/nspr/prtime.h', - 'third_party/superfasthash/superfasthash.c', - 'third_party/xdg_mime/xdgmime.h', - 'thread_task_runner_handle.cc', ---- a/base/time/pr_time_unittest.cc -+++ b/base/time/pr_time_unittest.cc -@@ -6,7 +6,7 @@ - #include - - #include "base/compiler_specific.h" --#include "base/third_party/nspr/prtime.h" -+#include - #include "base/time/time.h" - #include "testing/gtest/include/gtest/gtest.h" - ---- a/base/time/time.cc -+++ b/base/time/time.cc -@@ -13,7 +13,8 @@ - #include "base/lazy_instance.h" - #include "base/logging.h" - #include "base/strings/stringprintf.h" --#include "base/third_party/nspr/prtime.h" -+ -+#include - - namespace base { - diff --git a/patches/debian/system/snappy.patch b/patches/debian/system/snappy.patch deleted file mode 100644 index 47515e44..00000000 --- a/patches/debian/system/snappy.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/third_party/leveldatabase/leveldatabase.gyp -+++ b/third_party/leveldatabase/leveldatabase.gyp -@@ -56,7 +56,7 @@ - 'conditions': [ - ['use_snappy', { - 'dependencies': [ -- '../../third_party/snappy/snappy.gyp:snappy', -+ '../../build/linux/unbundle/snappy.gyp:snappy', - ], - }], - ], ---- a/third_party/WebKit/Source/core/core.gyp -+++ b/third_party/WebKit/Source/core/core.gyp -@@ -187,7 +187,7 @@ - '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', - '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', - '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', -- '<(DEPTH)/third_party/snappy/snappy.gyp:snappy', -+ '<(DEPTH)/build/linux/unbundle/snappy.gyp:snappy', - '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', - '<(DEPTH)/url/url.gyp:url_lib', - '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', -@@ -703,7 +703,7 @@ - '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', - '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', - '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', -- '<(DEPTH)/third_party/snappy/snappy.gyp:snappy', -+ '<(DEPTH)/build/linux/unbundle/snappy.gyp:snappy', - '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', - '<(DEPTH)/url/url.gyp:url_lib', - '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', ---- a/build/linux/unbundle/snappy.gyp -+++ b/build/linux/unbundle/snappy.gyp -@@ -17,7 +17,7 @@ - ], - }, - 'includes': [ -- '../../build/shim_headers.gypi', -+ '../../shim_headers.gypi', - ], - 'link_settings': { - 'libraries': [ ---- a/third_party/leveldatabase/port/port_chromium.cc -+++ b/third_party/leveldatabase/port/port_chromium.cc -@@ -8,7 +8,7 @@ - #include "util/logging.h" - - #if defined(USE_SNAPPY) --# include "third_party/snappy/src/snappy.h" -+# include - #endif - - namespace leveldb { ---- a/third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp -+++ b/third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp -@@ -38,7 +38,7 @@ - #include "platform/ScriptForbiddenScope.h" - #include "platform/TraceEvent.h" - #include "public/platform/Platform.h" --#include "third_party/snappy/src/snappy.h" -+#include - #include "wtf/CurrentTime.h" - - #if defined(WTF_OS_WIN) diff --git a/patches/inox-patchset/add-duckduckgo-search-engine.patch b/patches/inox-patchset/add-duckduckgo-search-engine.patch deleted file mode 100644 index 1578a282..00000000 --- a/patches/inox-patchset/add-duckduckgo-search-engine.patch +++ /dev/null @@ -1,585 +0,0 @@ ---- ./components/search_engines/prepopulated_engines.json -+++ ./components/search_engines/prepopulated_engines.json.new -@@ -36,6 +36,17 @@ - // The following engines are included in country lists and are added to the - // list of search engines on the first run depending on user's country. - "elements": { -+ "duckduckgo": { -+ "name": "DuckDuckGo", -+ "keyword": "duckduckgo.com", -+ "favicon_url": "https://duckduckgo.com/favicon.ico", -+ "search_url": "https://duckduckgo.com/?q={searchTerms}", -+ "suggest_url": "https://duckduckgo.com/?q={searchTerms}&language={language}&kac=1", -+ "new_tab_url": "about:blank", -+ "type": "SEARCH_ENGINE_DUCKDUCKGO", -+ "id": 11 -+ }, -+ - "aol": { - "name": "AOL", - "keyword": "aol.com", ---- ./components/search_engines/search_engine_type.h -+++ ./components/search_engines/search_engine_type.h.new -@@ -58,6 +58,7 @@ enum SearchEngineType { - SEARCH_ENGINE_YAHOO, - SEARCH_ENGINE_YANDEX, - SEARCH_ENGINE_ZOZNAM, -+ SEARCH_ENGINE_DUCKDUCKGO, - SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. - }; - - ---- ./components/search_engines/template_url_prepopulate_data.cc -+++ ./components/search_engines/template_url_prepopulate_data.cc.new -@@ -49,441 +49,441 @@ namespace { - - // Default (for countries with no better engine set) - const PrepopulatedEngine* engines_default[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // United Arab Emirates - const PrepopulatedEngine* engines_AE[] = -- { &google, &yahoo_maktoob, &bing, }; -+ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; - - // Albania - const PrepopulatedEngine* engines_AL[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Argentina - const PrepopulatedEngine* engines_AR[] = -- { &google, &bing, &yahoo_ar, }; -+ { &duckduckgo, &google, &bing, &yahoo_ar, }; - - // Austria - const PrepopulatedEngine* engines_AT[] = -- { &google, &bing, &yahoo_at, }; -+ { &duckduckgo, &google, &bing, &yahoo_at, }; - - // Australia - const PrepopulatedEngine* engines_AU[] = -- { &google, &bing, &yahoo_au, }; -+ { &duckduckgo, &google, &bing, &yahoo_au, }; - - // Bosnia and Herzegovina - const PrepopulatedEngine* engines_BA[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Belgium - const PrepopulatedEngine* engines_BE[] = -- { &google, &bing, &yahoo, &yahoo_fr, }; -+ { &duckduckgo, &google, &bing, &yahoo, &yahoo_fr, }; - - // Bulgaria - const PrepopulatedEngine* engines_BG[] = -- { &google, &bing, &ask, }; -+ { &duckduckgo, &google, &bing, &ask, }; - - // Bahrain - const PrepopulatedEngine* engines_BH[] = -- { &google, &yahoo_maktoob, &bing, }; -+ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; - - // Burundi - const PrepopulatedEngine* engines_BI[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Brunei - const PrepopulatedEngine* engines_BN[] = -- { &google, &yahoo_my, &bing, }; -+ { &duckduckgo, &google, &yahoo_my, &bing, }; - - // Bolivia - const PrepopulatedEngine* engines_BO[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Brazil - const PrepopulatedEngine* engines_BR[] = -- { &google, &ask_br, &bing, &yahoo_br, }; -+ { &duckduckgo, &google, &ask_br, &bing, &yahoo_br, }; - - // Belarus - const PrepopulatedEngine* engines_BY[] = -- { &google, &yahoo_ru, &bing, }; -+ { &duckduckgo, &google, &yahoo_ru, &bing, }; - - // Belize - const PrepopulatedEngine* engines_BZ[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Canada - const PrepopulatedEngine* engines_CA[] = -- { &google, &bing, &ask, &yahoo_ca, &yahoo_qc, }; -+ { &duckduckgo, &google, &bing, &ask, &yahoo_ca, &yahoo_qc, }; - - // Switzerland - const PrepopulatedEngine* engines_CH[] = -- { &google, &bing, &yahoo_ch, }; -+ { &duckduckgo, &google, &bing, &yahoo_ch, }; - - // Chile - const PrepopulatedEngine* engines_CL[] = -- { &google, &bing, &yahoo_cl, }; -+ { &duckduckgo, &google, &bing, &yahoo_cl, }; - - // China - const PrepopulatedEngine* engines_CN[] = -- { &google, &baidu, &sogou, }; -+ { &duckduckgo, &google, &baidu, &sogou, }; - - // Colombia - const PrepopulatedEngine* engines_CO[] = -- { &google, &bing, &yahoo_co, }; -+ { &duckduckgo, &google, &bing, &yahoo_co, }; - - // Costa Rica - const PrepopulatedEngine* engines_CR[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Czech Republic - const PrepopulatedEngine* engines_CZ[] = -- { &google, &seznam, &bing, }; -+ { &duckduckgo, &google, &seznam, &bing, }; - - // Germany - const PrepopulatedEngine* engines_DE[] = -- { &google, &bing, &yahoo_de }; -+ { &duckduckgo, &google, &bing, &yahoo_de }; - - // Denmark - const PrepopulatedEngine* engines_DK[] = -- { &google, &bing, &yahoo_dk, }; -+ { &duckduckgo, &google, &bing, &yahoo_dk, }; - - // Dominican Republic - const PrepopulatedEngine* engines_DO[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Algeria - const PrepopulatedEngine* engines_DZ[] = -- { &google, &bing, &yahoo_maktoob, }; -+ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; - - // Ecuador - const PrepopulatedEngine* engines_EC[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Estonia - const PrepopulatedEngine* engines_EE[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Egypt - const PrepopulatedEngine* engines_EG[] = -- { &google, &yahoo_maktoob, &bing, }; -+ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; - - // Spain - const PrepopulatedEngine* engines_ES[] = -- { &google, &bing, &yahoo_es, }; -+ { &duckduckgo, &google, &bing, &yahoo_es, }; - - // Faroe Islands - const PrepopulatedEngine* engines_FO[] = -- { &google, &bing, &ask, }; -+ { &duckduckgo, &google, &bing, &ask, }; - - // Finland - const PrepopulatedEngine* engines_FI[] = -- { &google, &bing, &yahoo_fi, }; -+ { &duckduckgo, &google, &bing, &yahoo_fi, }; - - // France - const PrepopulatedEngine* engines_FR[] = -- { &google, &bing, &yahoo_fr, }; -+ { &duckduckgo, &google, &bing, &yahoo_fr, }; - - // United Kingdom - const PrepopulatedEngine* engines_GB[] = -- { &google, &bing, &yahoo_uk, &ask_uk, }; -+ { &duckduckgo, &google, &bing, &yahoo_uk, &ask_uk, }; - - // Greece - const PrepopulatedEngine* engines_GR[] = -- { &google, &bing, &yahoo_gr, }; -+ { &duckduckgo, &google, &bing, &yahoo_gr, }; - - // Guatemala - const PrepopulatedEngine* engines_GT[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Hong Kong - const PrepopulatedEngine* engines_HK[] = -- { &google, &yahoo_hk, &baidu, &bing, }; -+ { &duckduckgo, &google, &yahoo_hk, &baidu, &bing, }; - - // Honduras - const PrepopulatedEngine* engines_HN[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Croatia - const PrepopulatedEngine* engines_HR[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Hungary - const PrepopulatedEngine* engines_HU[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Indonesia - const PrepopulatedEngine* engines_ID[] = -- { &google, &yahoo_id, &bing, }; -+ { &duckduckgo, &google, &yahoo_id, &bing, }; - - // Ireland - const PrepopulatedEngine* engines_IE[] = -- { &google, &bing, &yahoo_uk, }; -+ { &duckduckgo, &google, &bing, &yahoo_uk, }; - - // Israel - const PrepopulatedEngine* engines_IL[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // India - const PrepopulatedEngine* engines_IN[] = -- { &google, &bing, &yahoo_in, }; -+ { &duckduckgo, &google, &bing, &yahoo_in, }; - - // Iraq - const PrepopulatedEngine* engines_IQ[] = -- { &google, &yahoo_maktoob, &bing, }; -+ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; - - // Iran - const PrepopulatedEngine* engines_IR[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Iceland - const PrepopulatedEngine* engines_IS[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Italy - const PrepopulatedEngine* engines_IT[] = -- { &google, &virgilio, &bing, }; -+ { &duckduckgo, &google, &virgilio, &bing, }; - - // Jamaica - const PrepopulatedEngine* engines_JM[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Jordan - const PrepopulatedEngine* engines_JO[] = -- { &google, &yahoo_maktoob, &bing, }; -+ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; - - // Japan - const PrepopulatedEngine* engines_JP[] = -- { &google, &yahoo_jp, &bing, }; -+ { &duckduckgo, &google, &yahoo_jp, &bing, }; - - // Kenya - const PrepopulatedEngine* engines_KE[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Kuwait - const PrepopulatedEngine* engines_KW[] = -- { &google, &yahoo_maktoob, &bing, }; -+ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; - - // South Korea - const PrepopulatedEngine* engines_KR[] = -- { &google, &naver, &daum, }; -+ { &duckduckgo, &google, &naver, &daum, }; - - // Kazakhstan - const PrepopulatedEngine* engines_KZ[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Lebanon - const PrepopulatedEngine* engines_LB[] = -- { &google, &yahoo_maktoob, &bing, }; -+ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; - - // Liechtenstein - const PrepopulatedEngine* engines_LI[] = -- { &google, &bing, &yahoo_de, }; -+ { &duckduckgo, &google, &bing, &yahoo_de, }; - - // Lithuania - const PrepopulatedEngine* engines_LT[] = -- { &google, &bing, &yandex_ru, }; -+ { &duckduckgo, &google, &bing, &yandex_ru, }; - - // Luxembourg - const PrepopulatedEngine* engines_LU[] = -- { &google, &bing, &yahoo_fr, }; -+ { &duckduckgo, &google, &bing, &yahoo_fr, }; - - // Latvia - const PrepopulatedEngine* engines_LV[] = -- { &google, &yandex_ru, &bing, }; -+ { &duckduckgo, &google, &yandex_ru, &bing, }; - - // Libya - const PrepopulatedEngine* engines_LY[] = -- { &google, &yahoo_maktoob, &bing, }; -+ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; - - // Morocco - const PrepopulatedEngine* engines_MA[] = -- { &google, &bing, &yahoo_maktoob, }; -+ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; - - // Monaco - const PrepopulatedEngine* engines_MC[] = -- { &google, &yahoo_fr, &bing, }; -+ { &duckduckgo, &google, &yahoo_fr, &bing, }; - - // Moldova - const PrepopulatedEngine* engines_MD[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Montenegro - const PrepopulatedEngine* engines_ME[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Macedonia - const PrepopulatedEngine* engines_MK[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Mexico - const PrepopulatedEngine* engines_MX[] = -- { &google, &bing, &yahoo_mx, }; -+ { &duckduckgo, &google, &bing, &yahoo_mx, }; - - // Malaysia - const PrepopulatedEngine* engines_MY[] = -- { &google, &yahoo_my, &bing, }; -+ { &duckduckgo, &google, &yahoo_my, &bing, }; - - // Nicaragua - const PrepopulatedEngine* engines_NI[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Netherlands - const PrepopulatedEngine* engines_NL[] = -- { &google, &yahoo_nl, &vinden, }; -+ { &duckduckgo, &google, &yahoo_nl, &vinden, }; - - // Norway - const PrepopulatedEngine* engines_NO[] = -- { &google, &bing, &kvasir, }; -+ { &duckduckgo, &google, &bing, &kvasir, }; - - // New Zealand - const PrepopulatedEngine* engines_NZ[] = -- { &google, &bing, &yahoo_nz, }; -+ { &duckduckgo, &google, &bing, &yahoo_nz, }; - - // Oman - const PrepopulatedEngine* engines_OM[] = -- { &google, &bing, &yahoo_maktoob, }; -+ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; - - // Panama - const PrepopulatedEngine* engines_PA[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Peru - const PrepopulatedEngine* engines_PE[] = -- { &google, &bing, &yahoo_pe, }; -+ { &duckduckgo, &google, &bing, &yahoo_pe, }; - - // Philippines - const PrepopulatedEngine* engines_PH[] = -- { &google, &yahoo_ph, &bing, }; -+ { &duckduckgo, &google, &yahoo_ph, &bing, }; - - // Pakistan - const PrepopulatedEngine* engines_PK[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Puerto Rico - const PrepopulatedEngine* engines_PR[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Poland - const PrepopulatedEngine* engines_PL[] = -- { &google, &onet, &bing, }; -+ { &duckduckgo, &google, &onet, &bing, }; - - // Portugal - const PrepopulatedEngine* engines_PT[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Paraguay - const PrepopulatedEngine* engines_PY[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Qatar - const PrepopulatedEngine* engines_QA[] = -- { &google, &yahoo_maktoob, &bing, }; -+ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; - - // Romania - const PrepopulatedEngine* engines_RO[] = -- { &google, &yahoo_ro, &bing, }; -+ { &duckduckgo, &google, &yahoo_ro, &bing, }; - - // Serbia - const PrepopulatedEngine* engines_RS[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Russia - const PrepopulatedEngine* engines_RU[] = -- { &google, &yandex_ru, &mail_ru, }; -+ { &duckduckgo, &google, &yandex_ru, &mail_ru, }; - - // Rwanda - const PrepopulatedEngine* engines_RW[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Saudi Arabia - const PrepopulatedEngine* engines_SA[] = -- { &google, &yahoo_maktoob, &bing, }; -+ { &duckduckgo, &google, &yahoo_maktoob, &bing, }; - - // Sweden - const PrepopulatedEngine* engines_SE[] = -- { &google, &bing, &yahoo_se, }; -+ { &duckduckgo, &google, &bing, &yahoo_se, }; - - // Singapore - const PrepopulatedEngine* engines_SG[] = -- { &google, &yahoo_sg, &bing, }; -+ { &duckduckgo, &google, &yahoo_sg, &bing, }; - - // Slovenia - const PrepopulatedEngine* engines_SI[] = -- { &google, &najdi, &ask, }; -+ { &duckduckgo, &google, &najdi, &ask, }; - - // Slovakia - const PrepopulatedEngine* engines_SK[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // El Salvador - const PrepopulatedEngine* engines_SV[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Syria - const PrepopulatedEngine* engines_SY[] = -- { &google, &bing, &yahoo_maktoob, }; -+ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; - - // Thailand - const PrepopulatedEngine* engines_TH[] = -- { &google, &yahoo_th, &bing, }; -+ { &duckduckgo, &google, &yahoo_th, &bing, }; - - // Tunisia - const PrepopulatedEngine* engines_TN[] = -- { &google, &bing, &yahoo_maktoob, }; -+ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; - - // Turkey - const PrepopulatedEngine* engines_TR[] = -- { &google, &bing, &yahoo_tr, &yandex_tr, }; -+ { &duckduckgo, &google, &bing, &yahoo_tr, &yandex_tr, }; - - // Trinidad and Tobago - const PrepopulatedEngine* engines_TT[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Taiwan - const PrepopulatedEngine* engines_TW[] = -- { &google, &yahoo_tw, &bing, }; -+ { &duckduckgo, &google, &yahoo_tw, &bing, }; - - // Tanzania - const PrepopulatedEngine* engines_TZ[] = -- { &google, &yahoo, &bing, }; -+ { &duckduckgo, &google, &yahoo, &bing, }; - - // Ukraine - const PrepopulatedEngine* engines_UA[] = -- { &google, &yandex_ua, &bing, }; -+ { &duckduckgo, &google, &yandex_ua, &bing, }; - - // United States - const PrepopulatedEngine* engines_US[] = -- { &google, &bing, &yahoo, &aol, &ask, }; -+ { &duckduckgo, &google, &bing, &yahoo, &aol, &ask, }; - - // Uruguay - const PrepopulatedEngine* engines_UY[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Venezuela - const PrepopulatedEngine* engines_VE[] = -- { &google, &bing, &yahoo_ve, }; -+ { &duckduckgo, &google, &bing, &yahoo_ve, }; - - // Vietnam - const PrepopulatedEngine* engines_VN[] = -- { &google, &yahoo_vn, &bing, }; -+ { &duckduckgo, &google, &yahoo_vn, &bing, }; - - // Yemen - const PrepopulatedEngine* engines_YE[] = -- { &google, &bing, &yahoo_maktoob, }; -+ { &duckduckgo, &google, &bing, &yahoo_maktoob, }; - - // South Africa - const PrepopulatedEngine* engines_ZA[] = -- { &google, &bing, &yahoo, }; -+ { &duckduckgo, &google, &bing, &yahoo, }; - - // Zimbabwe - const PrepopulatedEngine* engines_ZW[] = -- { &google, &bing, &yahoo, &ask, }; -+ { &duckduckgo, &google, &bing, &yahoo, &ask, }; - - // A list of all the engines that we know about. - const PrepopulatedEngine* kAllEngines[] = { - // Prepopulated engines: - &aol, &ask, &ask_br, &ask_uk, &baidu, -- &bing, &daum, &google, &kvasir, &mail_ru, -+ &bing, &daum,&duckduckgo,&google, &kvasir, &mail_ru, - &najdi, &naver, &onet, &seznam, &sogou, - &vinden, &virgilio, &yahoo, &yahoo_ar, &yahoo_at, - &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch, &yahoo_cl, - diff --git a/patches/inox-patchset/branding.patch b/patches/inox-patchset/branding.patch deleted file mode 100644 index c78c4342..00000000 --- a/patches/inox-patchset/branding.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- ./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 $1someone@example.com 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 <a target="_blank" href="$2">Google Dashboard</a>. - - -- Chromium -+ Inox - - -- Chromium -+ Inox - - - -- Chromium -+ Inox - - -- 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. - - - -@@ -241,7 +241,7 @@ be available for now. --> - Chromium App Launcher - - -- Chromium Binaries -+ Inox Binaries - - - https://support.google.com/chrome/?p=ib_chromeframe -@@ -272,17 +272,17 @@ be available for now. --> - - - -- Task Manager - Chromium -+ Task Manager - Inox - - -- Chromium didn't shut down correctly. -+ Inox did not shut down correctly. - - - Help make Chromium better by sending crash reports and $1usage statistics to Google - - - -- $1Google - Chromium -+ $1Google – Inox - - - -@@ -787,7 +787,7 @@ For Chromium, processes used to display diagnostics information (such as this "a - - - -- About &Chromium -+ About &Inox - - - Update &Chromium -@@ -795,7 +795,7 @@ For Chromium, processes used to display diagnostics information (such as this "a - - - -- About &Chromium -+ About &Inox - - - Update &Chromium -@@ -812,7 +812,7 @@ For Chromium, processes used to display diagnostics information (such as this "a - - - -- Chromium -+ Inox - - - Chromium Helper - - - diff --git a/patches/inox-patchset/chromium-sandbox-pie.patch b/patches/inox-patchset/chromium-sandbox-pie.patch deleted file mode 100644 index fc187500..00000000 --- a/patches/inox-patchset/chromium-sandbox-pie.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/sandbox/linux/sandbox_linux.gypi -+++ b/sandbox/linux/sandbox_linux.gypi -@@ -221,7 +221,10 @@ - ], - 'cflags': [ - # For ULLONG_MAX -- '-std=gnu99', -+ '-std=gnu99 -fPIE', -+ ], -+ 'ldflags': [ -+ '-pie', - ], - 'include_dirs': [ - '../..', diff --git a/patches/inox-patchset/disable-default-extensions.patch b/patches/inox-patchset/disable-default-extensions.patch index 718cd071..789973ca 100644 --- a/patches/inox-patchset/disable-default-extensions.patch +++ b/patches/inox-patchset/disable-default-extensions.patch @@ -36,7 +36,7 @@ --- ./chrome/browser/extensions/component_loader.cc +++ ./chrome/browser/extensions/component_loader.cc.new -@@ -350,24 +350,12 @@ +@@ -350,10 +350,6 @@ } void ComponentLoader::AddHangoutServicesExtension() { @@ -47,20 +47,6 @@ } 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(profile_)) { -- Add(IDR_HOTWORD_MANIFEST, -- base::FilePath(FILE_PATH_LITERAL("hotword"))); -- } - } - - void ComponentLoader::AddImageLoaderExtension() { @@ -384,43 +384,6 @@ } diff --git a/patches/inox-patchset/disable-gcm-status-check.patch b/patches/inox-patchset/disable-gcm-status-check.patch deleted file mode 100644 index 2ae17d0b..00000000 --- a/patches/inox-patchset/disable-gcm-status-check.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- ./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( - diff --git a/patches/inox-patchset/disable-google-ipv6-probes.patch b/patches/inox-patchset/disable-google-ipv6-probes.patch deleted file mode 100644 index a9b3518f..00000000 --- a/patches/inox-patchset/disable-google-ipv6-probes.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./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 - diff --git a/patches/inox-patchset/disable-google-url-tracker.patch b/patches/inox-patchset/disable-google-url-tracker.patch index a3f21d2f..4043a975 100644 --- a/patches/inox-patchset/disable-google-url-tracker.patch +++ b/patches/inox-patchset/disable-google-url-tracker.patch @@ -4,11 +4,11 @@ const char GoogleURLTracker::kDefaultGoogleHomepage[] = -- "https://www.google.com/"; -+ ""; +- "trk:192:https://www.google.com/"; ++ "trk:192:about:blank"; const char GoogleURLTracker::kSearchDomainCheckURL[] = - "https://www.google.com/searchdomaincheck?format=domain&type=chrome"; -+ ""; ++ "trk:193:about:blank"; GoogleURLTracker::GoogleURLTracker(scoped_ptr client, Mode mode) diff --git a/patches/inox-patchset/disable-missing-key-warning.patch b/patches/inox-patchset/disable-missing-key-warning.patch deleted file mode 100644 index aaa1a75e..00000000 --- a/patches/inox-patchset/disable-missing-key-warning.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc -+++ ./chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc.new -@@ -15,6 +15,7 @@ - - // static - void GoogleApiKeysInfoBarDelegate::Create(InfoBarService* infobar_service) { -+ return; - if (google_apis::HasKeysConfigured()) - return; - diff --git a/patches/inox-patchset/disable-notification-promo-fetch.patch b/patches/inox-patchset/disable-notification-promo-fetch.patch deleted file mode 100644 index 4816fc01..00000000 --- a/patches/inox-patchset/disable-notification-promo-fetch.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- ./chrome/browser/browser_process_impl.cc -+++ ./chrome/browser/browser_process_impl.cc.new -@@ -1082,7 +1082,6 @@ - local_state(), chrome::GetChannel(), GetApplicationLocale(), - system_request_context(), switches::kDisableBackgroundNetworking, - base::Bind(safe_json::SafeJsonParser::Parse))); -- promo_resource_service_->StartAfterDelay(); - } - - #if !defined(OS_ANDROID) && !defined(OS_IOS) - - - ---- ./chrome/browser/signin/signin_promo.cc -+++ ./chrome/browser/signin/signin_promo.cc.new -@@ -105,6 +105,7 @@ bool ShouldShowPromo(Profile* profile) { - - bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) { - DCHECK(profile); -+ return false; - - // Don't show if the profile is an incognito. - if (profile->IsOffTheRecord()) - - ---- ./components/web_resource/notification_promo.cc -+++ ./components/web_resource/notification_promo.cc.new -@@ -30,7 +30,7 @@ namespace { - - const int kDefaultGroupSize = 100; - --const char promo_server_url[] = "https://clients3.google.com/crsignal/client"; -+const char promo_server_url[] = "about:blank"; - - // The name of the preference that stores the promotion object. - const char kPrefPromoObject[] = "promo"; diff --git a/patches/inox-patchset/disable-translation-lang-fetch.patch b/patches/inox-patchset/disable-translation-lang-fetch.patch index ebccaad5..46380115 100644 --- a/patches/inox-patchset/disable-translation-lang-fetch.patch +++ b/patches/inox-patchset/disable-translation-lang-fetch.patch @@ -1,42 +1,3 @@ ---- ./components/translate/core/browser/translate_language_list.cc -+++ ./components/translate/core/browser/translate_language_list.cc.new -@@ -200,35 +200,6 @@ - } - - void TranslateLanguageList::RequestLanguageList() { -- // If resource requests are not allowed, we'll get a callback when they are. -- if (!resource_requests_allowed_) { -- request_pending_ = true; -- return; -- } -- -- request_pending_ = false; -- -- if (language_list_fetcher_.get() && -- (language_list_fetcher_->state() == TranslateURLFetcher::IDLE || -- language_list_fetcher_->state() == TranslateURLFetcher::FAILED)) { -- GURL url = TranslateLanguageUrl(); -- url = AddHostLocaleToUrl(url); -- url = AddApiKeyToUrl(url); -- url = net::AppendQueryParameter( -- url, kAlphaLanguageQueryName, kAlphaLanguageQueryValue); -- -- std::string message = base::StringPrintf( -- "Language list including alpha languages fetch starts (URL: %s)", -- url.spec().c_str()); -- NotifyEvent(__LINE__, message); -- -- bool result = language_list_fetcher_->Request( -- url, -- base::Bind(&TranslateLanguageList::OnLanguageListFetchComplete, -- base::Unretained(this))); -- if (!result) -- NotifyEvent(__LINE__, "Request is omitted due to retry limit"); -- } - } - - void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) { - --- ./chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ ./chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc.new @@ -145,7 +145,6 @@ diff --git a/patches/inox-patchset/disable-update-pings.patch b/patches/inox-patchset/disable-update-pings.patch deleted file mode 100644 index d32934c3..00000000 --- a/patches/inox-patchset/disable-update-pings.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./components/component_updater/configurator_impl.cc -+++ ./components/component_updater/configurator_impl.cc.new -@@ -153,14 +153,6 @@ - - std::vector ConfiguratorImpl::UpdateUrl() const { - std::vector urls; -- if (url_source_override_.is_valid()) { -- urls.push_back(GURL(url_source_override_)); -- } else { -- urls.push_back(GURL(kUpdaterDefaultUrl)); -- if (fallback_to_alt_source_url_enabled_) { -- urls.push_back(GURL(kUpdaterAltUrl)); -- } -- } - return urls; - } - diff --git a/patches/inox-patchset/launcher-branding.patch b/patches/inox-patchset/launcher-branding.patch deleted file mode 100644 index 124b54a4..00000000 --- a/patches/inox-patchset/launcher-branding.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- ./Makefile -+++ ./Makefile.new -@@ -1,9 +1,9 @@ --OUT := chromium-launcher launcher-errmsg -+OUT := inox-launcher launcher-errmsg - - CHROMIUM_SUFFIX := - PREFIX := /usr/local - --CHROMIUM_NAME := chromium$(CHROMIUM_SUFFIX) -+CHROMIUM_NAME := inox$(CHROMIUM_SUFFIX) - CHROMIUM_BIN := /usr/lib/$(CHROMIUM_NAME)/$(CHROMIUM_NAME) - PEPPER_FLASH_DIR := /usr/lib/PepperFlash - -@@ -15,7 +15,7 @@ - - all: $(OUT) - --chromium-launcher: chromium-launcher.in -+inox-launcher: chromium-launcher.in - sed \ - -e "s|@CHROMIUM_NAME@|$(CHROMIUM_NAME)|g" \ - -e "s|@CHROMIUM_BIN@|$(CHROMIUM_BIN)|g" \ -@@ -24,7 +24,7 @@ - $< >$@ - - install: all -- install -Dm755 chromium-launcher "$(DESTDIR)$(PREFIX)/bin/$(CHROMIUM_NAME)" -+ install -Dm755 inox-launcher "$(DESTDIR)$(PREFIX)/bin/$(CHROMIUM_NAME)" - install -Dm755 launcher-errmsg "$(DESTDIR)$(LAUNCHER_ERRMSG)" - - install-strip: install - diff --git a/patches/inox-patchset/modify-default-prefs.patch b/patches/inox-patchset/modify-default-prefs.patch index c6c9a06b..55b241e7 100644 --- a/patches/inox-patchset/modify-default-prefs.patch +++ b/patches/inox-patchset/modify-default-prefs.patch @@ -1,92 +1,3 @@ ---- ./chrome/browser/chrome_content_browser_client.cc -+++ ./chrome/browser/chrome_content_browser_client.cc.new -@@ -639,7 +639,7 @@ - void ChromeContentBrowserClient::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false); -- registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true); -+ registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false); - registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures); - } - - - ---- ./chrome/browser/ui/browser_ui_prefs.cc -+++ ./chrome/browser/ui/browser_ui_prefs.cc.new -@@ -86,7 +86,7 @@ - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); - registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true); -- registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, true); -+ registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, false); - registry->RegisterBooleanPref(prefs::kDevToolsDisabled, false); - registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); - registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup); - - - ---- ./chrome/browser/net/prediction_options.cc -+++ ./chrome/browser/net/prediction_options.cc.new -@@ -25,7 +25,7 @@ bool CanPrefetchAndPrerender(int network_prediction_options) { - case NETWORK_PREDICTION_NEVER: - return false; - default: -- DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options); -+ //DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options); - return !net::NetworkChangeNotifier::IsConnectionCellular( - net::NetworkChangeNotifier::GetConnectionType()); - } - - ---- ./chrome/browser/net/prediction_options.h -+++ ./chrome/browser/net/prediction_options.h.new -@@ -21,7 +21,7 @@ enum NetworkPredictionOptions { - NETWORK_PREDICTION_ALWAYS, - NETWORK_PREDICTION_WIFI_ONLY, - NETWORK_PREDICTION_NEVER, -- NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_WIFI_ONLY, -+ NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER, - }; - - void RegisterPredictionOptionsProfilePrefs( - - ---- ./chrome/browser/background/background_mode_manager.cc -+++ ./chrome/browser/background/background_mode_manager.cc.new -@@ -330,7 +330,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { - registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); - registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); - #endif -- registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true); -+ registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false); - } - - ---- ./components/content_settings/core/browser/cookie_settings.cc -+++ ./components/content_settings/core/browser/cookie_settings.cc.new -@@ -82,7 +82,7 @@ - void CookieSettings::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* registry) { - registry->RegisterBooleanPref( -- prefs::kBlockThirdPartyCookies, false, -+ prefs::kBlockThirdPartyCookies, true, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - } - - - ---- ./chrome/browser/ui/navigation_correction_tab_observer.cc -+++ ./chrome/browser/ui/navigation_correction_tab_observer.cc.new -@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() { - void NavigationCorrectionTabObserver::RegisterProfilePrefs( - user_prefs::PrefRegistrySyncable* prefs) { - prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, -- true, -+ false, - user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); - } - - --- ./components/autofill/core/browser/autofill_manager.cc +++ ./components/autofill/core/browser/autofill_manager.cc.new @@ -164,7 +164,7 @@ void AutofillManager::RegisterProfilePrefs( @@ -100,19 +11,6 @@ prefs::kAutofillWalletSyncExperimentEnabled, ---- ./chrome/browser/resources/options/reset_profile_settings_overlay.html -+++ ./chrome/browser/resources/options/reset_profile_settings_overlay.html.new -@@ -24,7 +24,7 @@ -
-