mirror of
https://github.com/morgan9e/helium
synced 2026-04-15 00:44:06 +09:00
Removed unwanted Iridium patches
Removed duplicate patches from Inox patchset and Debian patches Updated patch_order
This commit is contained in:
Eloston
@@ -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_))
|
||||
@@ -1,14 +0,0 @@
|
||||
description: disable third-party cookies by default
|
||||
author: Chad Miller <chad.miller@canonical.com>
|
||||
|
||||
--- 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);
|
||||
}
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
Description: manpage updates/fixes
|
||||
Forwarded: http://code.google.com/p/chromium/issues/detail?id=73591
|
||||
Author: Daniel Echeverry <epsilon77@gmail.com>
|
||||
|
||||
--- 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
|
||||
<http://library.gnome.org/devel/gtk/stable/gtk-running.html>
|
||||
+.IP
|
||||
<http://library.gnome.org/devel/gtk/stable/gtk-x11.html>
|
||||
|
||||
.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',
|
||||
},
|
||||
}],
|
||||
@@ -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
|
||||
@@ -1,16 +0,0 @@
|
||||
description: use system clang compilers
|
||||
author: Michael Gilbert <mgilbert@debian.org>
|
||||
|
||||
--- 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)'],
|
||||
],
|
||||
@@ -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 <Andreas.Cadhalpun@googlemail.com>
|
||||
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 <libavcodec/avcodec.h>
|
||||
#include <libavformat/avformat.h>
|
||||
-#include <libavformat/internal.h>
|
||||
#include <libavformat/avio.h>
|
||||
#include <libavutil/avutil.h>
|
||||
#include <libavutil/imgutils.h>
|
||||
--- 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<base::TimeDelta> 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<int64>(AV_NOPTS_VALUE)) {
|
||||
- struct AVPacketList* packet_buffer = internal->packet_buffer;
|
||||
- while (packet_buffer != internal->packet_buffer_end) {
|
||||
- DCHECK_LT(static_cast<size_t>(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<int64>(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',
|
||||
],
|
||||
}],
|
||||
@@ -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 <time.h>
|
||||
|
||||
#include "base/compiler_specific.h"
|
||||
-#include "base/third_party/nspr/prtime.h"
|
||||
+#include <nspr/prtime.h>
|
||||
#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 <nspr/prtime.h>
|
||||
|
||||
namespace base {
|
||||
|
||||
@@ -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 <snappy.h>
|
||||
#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 <snappy.h>
|
||||
#include "wtf/CurrentTime.h"
|
||||
|
||||
#if defined(WTF_OS_WIN)
|
||||
@@ -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,
|
||||
|
||||
@@ -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 <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
|
||||
|
||||
|
||||
|
||||
@@ -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': [
|
||||
'../..',
|
||||
@@ -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 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<GoogleURLTrackerClient> client,
|
||||
Mode mode)
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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";
|
||||
@@ -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 @@
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
--- ./components/component_updater/configurator_impl.cc
|
||||
+++ ./components/component_updater/configurator_impl.cc.new
|
||||
@@ -153,14 +153,6 @@
|
||||
|
||||
std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
|
||||
std::vector<GURL> 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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 @@
|
||||
<div id="feedback-bar"
|
||||
class="gray-bottom-bar checkbox controlled-setting-with-label">
|
||||
<label>
|
||||
- <input id="send-settings" type="checkbox" checked>
|
||||
+ <input id="send-settings" type="checkbox">
|
||||
<span>
|
||||
<span i18n-content="resetProfileSettingsFeedback"></span>
|
||||
<span id="expand-feedback"></span>
|
||||
|
||||
|
||||
--- ./chrome/browser/io_thread.cc
|
||||
+++ ./chrome/browser/io_thread.cc.new
|
||||
@@ -1113,7 +1113,7 @@
|
||||
@@ -147,34 +45,6 @@
|
||||
}
|
||||
|
||||
|
||||
--- ./chrome/browser/signin/signin_promo.cc
|
||||
+++ ./chrome/browser/signin/signin_promo.cc.new
|
||||
@@ -253,8 +253,8 @@
|
||||
void RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
|
||||
- registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, false);
|
||||
- registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true);
|
||||
+ registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true);
|
||||
+ registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false);
|
||||
registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
|
||||
}
|
||||
|
||||
|
||||
|
||||
--- ./chrome/browser/ui/browser_ui_prefs.cc
|
||||
+++ ./chrome/browser/ui/browser_ui_prefs.cc.new
|
||||
@@ -102,7 +102,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
||||
registry->RegisterBooleanPref(
|
||||
prefs::kEnableTranslate,
|
||||
- true,
|
||||
+ false,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
registry->RegisterStringPref(
|
||||
prefs::kCloudPrintEmail,
|
||||
|
||||
|
||||
--- ./components/bookmarks/browser/bookmark_utils.cc
|
||||
+++ ./components/bookmarks/browser/bookmark_utils.cc.new
|
||||
@@ -424,7 +424,7 @@
|
||||
@@ -199,15 +69,6 @@
|
||||
|
||||
--- ./chrome/browser/profiles/profile.cc
|
||||
+++ ./chrome/browser/profiles/profile.cc.new
|
||||
@@ -76,7 +76,7 @@
|
||||
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
prefs::kSearchSuggestEnabled,
|
||||
- true,
|
||||
+ false,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
#if defined(OS_ANDROID)
|
||||
registry->RegisterStringPref(
|
||||
@@ -94,7 +94,7 @@
|
||||
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
||||
registry->RegisterBooleanPref(
|
||||
@@ -241,18 +102,3 @@
|
||||
xmpp_ping_enabled_ = prefs->GetBoolean(
|
||||
prefs::kCloudPrintXmppPingEnabled, false);
|
||||
|
||||
|
||||
|
||||
--- ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
|
||||
+++ ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc.new
|
||||
@@ -140,10 +140,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
prefs::kLocalDiscoveryNotificationsEnabled,
|
||||
-#if defined(OS_WIN)
|
||||
false,
|
||||
-#else
|
||||
- true,
|
||||
-#endif
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
}
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
From f3c364bb9cf7cc6fbc67daf02820f79827f7800b Mon Sep 17 00:00:00 2001
|
||||
From: Yuriy Shevchuk <yuriy@struktur.de>
|
||||
Date: Tue, 23 Dec 2014 16:54:56 +0100
|
||||
Subject: [PATCH 29/56] build: fix OSX branded build crashes on OSX
|
||||
|
||||
---
|
||||
build/common.gypi | 2 +-
|
||||
chrome/app/theme/chromium/BRANDING | 14 +++++++-------
|
||||
chrome/common/chrome_constants.cc | 4 ++--
|
||||
3 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/build/common.gypi b/build/common.gypi
|
||||
index cce7b3c..7c526c1 100644
|
||||
--- a/build/common.gypi
|
||||
+++ b/build/common.gypi
|
||||
@@ -1945,7 +1945,7 @@
|
||||
['branding=="Chrome"', {
|
||||
'mac_product_name%': 'Google Chrome',
|
||||
}, { # else: branding!="Chrome"
|
||||
- 'mac_product_name%': 'Chromium',
|
||||
+ 'mac_product_name%': 'Iridium',
|
||||
}],
|
||||
# Official mac builds require a specific OS X SDK, but iOS and
|
||||
# non-official mac builds do not.
|
||||
diff --git a/chrome/app/theme/chromium/BRANDING b/chrome/app/theme/chromium/BRANDING
|
||||
index f1e9946..1e39207 100644
|
||||
--- a/chrome/app/theme/chromium/BRANDING
|
||||
+++ b/chrome/app/theme/chromium/BRANDING
|
||||
@@ -1,7 +1,7 @@
|
||||
-COMPANY_FULLNAME=The Chromium Authors
|
||||
-COMPANY_SHORTNAME=The Chromium Authors
|
||||
-PRODUCT_FULLNAME=Chromium
|
||||
-PRODUCT_SHORTNAME=Chromium
|
||||
-PRODUCT_INSTALLER_FULLNAME=Chromium Installer
|
||||
-PRODUCT_INSTALLER_SHORTNAME=Chromium Installer
|
||||
-COPYRIGHT=Copyright 2015 The Chromium Authors. All rights reserved.
|
||||
+COMPANY_FULLNAME=The browser authors
|
||||
+COMPANY_SHORTNAME=The browser authors
|
||||
+PRODUCT_FULLNAME=Iridium
|
||||
+PRODUCT_SHORTNAME=Iridium
|
||||
+PRODUCT_INSTALLER_FULLNAME=Iridium Installer
|
||||
+PRODUCT_INSTALLER_SHORTNAME=Iridium Installer
|
||||
+COPYRIGHT=Copyright 2015 the browser authors. Some rights reserved.
|
||||
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
|
||||
index 4a1610f..47fcfc2 100644
|
||||
--- a/chrome/common/chrome_constants.cc
|
||||
+++ b/chrome/common/chrome_constants.cc
|
||||
@@ -7,11 +7,11 @@
|
||||
#define FPL FILE_PATH_LITERAL
|
||||
|
||||
#if defined(OS_MACOSX)
|
||||
-#define CHROMIUM_PRODUCT_STRING "Chromium"
|
||||
+#define CHROMIUM_PRODUCT_STRING "Iridium"
|
||||
#if defined(GOOGLE_CHROME_BUILD)
|
||||
#define PRODUCT_STRING "Google Chrome"
|
||||
#elif defined(CHROMIUM_BUILD)
|
||||
-#define PRODUCT_STRING "Chromium"
|
||||
+#define PRODUCT_STRING "Iridium"
|
||||
#else
|
||||
#error Unknown branding
|
||||
#endif
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,103 +0,0 @@
|
||||
From 781178f2a0f75e62ba87eea615a2ff24a9c7ddc7 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Wed, 8 Jul 2015 15:08:32 +0200
|
||||
Subject: [PATCH 56/56] common: set Iridium version and change User-Agent
|
||||
accordingly
|
||||
|
||||
Reduced version number:
|
||||
We do not use @BUILD@ or @PATCH@, in particular not in the User-Agent
|
||||
string.
|
||||
|
||||
As for the user agent, continue providing Chrome/* for possible
|
||||
compatibility checks by the browser and/or websites, since we
|
||||
really are still Chromium.
|
||||
|
||||
Note to self:
|
||||
Update "Chromium/*" in UA string when updating chrome/version.
|
||||
---
|
||||
android_webview/common/aw_version_info_values.h.version | 2 +-
|
||||
chrome/VERSION | 4 ++--
|
||||
components/version_info/version_info.cc | 2 +-
|
||||
components/version_info/version_info_values.h.version | 2 +-
|
||||
content/common/user_agent.cc | 2 ++
|
||||
extensions/shell/common/version.h.in | 2 +-
|
||||
6 files changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/android_webview/common/aw_version_info_values.h.version b/android_webview/common/aw_version_info_values.h.version
|
||||
index 72faf97..7c0f43d 100644
|
||||
--- a/android_webview/common/aw_version_info_values.h.version
|
||||
+++ b/android_webview/common/aw_version_info_values.h.version
|
||||
@@ -5,6 +5,6 @@
|
||||
#ifndef ANDROID_WEBVIEW_COMMON_AW_VERSION_INFO_VALUES_H_
|
||||
#define ANDROID_WEBVIEW_COMMON_AW_VERSION_INFO_VALUES_H_
|
||||
|
||||
-#define PRODUCT_VERSION "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
|
||||
+#define PRODUCT_VERSION "@MAJOR@.@MINOR@"
|
||||
|
||||
#endif // ANDROID_WEBVIEW_COMMON_AW_VERSION_INFO_VALUES_H_
|
||||
diff --git a/chrome/VERSION b/chrome/VERSION
|
||||
index fa20596..0438b10 100644
|
||||
--- a/chrome/VERSION
|
||||
+++ b/chrome/VERSION
|
||||
@@ -1,4 +1,4 @@
|
||||
MAJOR=47
|
||||
MINOR=0
|
||||
-BUILD=2526
|
||||
-PATCH=49
|
||||
+BUILD=0
|
||||
+PATCH=0
|
||||
diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc
|
||||
index de3f580..8118f2e 100644
|
||||
--- a/components/version_info/version_info.cc
|
||||
+++ b/components/version_info/version_info.cc
|
||||
@@ -12,7 +12,7 @@
|
||||
namespace version_info {
|
||||
|
||||
std::string GetProductNameAndVersionForUserAgent() {
|
||||
- return "Chrome/" + GetVersionNumber();
|
||||
+ return "Iridium/" + GetVersionNumber();
|
||||
}
|
||||
|
||||
std::string GetProductName() {
|
||||
diff --git a/components/version_info/version_info_values.h.version b/components/version_info/version_info_values.h.version
|
||||
index 6232e35..3cf4fee 100644
|
||||
--- a/components/version_info/version_info_values.h.version
|
||||
+++ b/components/version_info/version_info_values.h.version
|
||||
@@ -6,7 +6,7 @@
|
||||
#define COMPONENTS_VERSION_INFO_VERSION_INFO_VALUES_H_
|
||||
|
||||
#define PRODUCT_NAME "@PRODUCT_FULLNAME@"
|
||||
-#define PRODUCT_VERSION "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
|
||||
+#define PRODUCT_VERSION "@MAJOR@.@MINOR@"
|
||||
#define LAST_CHANGE "@LASTCHANGE@"
|
||||
#define IS_OFFICIAL_BUILD @OFFICIAL_BUILD@
|
||||
|
||||
diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
|
||||
index 467ad97..4ed8907 100644
|
||||
--- a/content/common/user_agent.cc
|
||||
+++ b/content/common/user_agent.cc
|
||||
@@ -199,6 +199,8 @@ std::string BuildUserAgentFromOSAndProduct(const std::string& os_info,
|
||||
product.c_str(),
|
||||
WEBKIT_VERSION_MAJOR,
|
||||
WEBKIT_VERSION_MINOR);
|
||||
+ if (strncmp(product.c_str(), "Chrome/", 7) != 0)
|
||||
+ base::StringAppendF(&user_agent, " Chrome/47.0.2526.49");
|
||||
return user_agent;
|
||||
}
|
||||
|
||||
diff --git a/extensions/shell/common/version.h.in b/extensions/shell/common/version.h.in
|
||||
index c4627fe..bf7d274 100644
|
||||
--- a/extensions/shell/common/version.h.in
|
||||
+++ b/extensions/shell/common/version.h.in
|
||||
@@ -7,7 +7,7 @@
|
||||
#ifndef EXTENSIONS_SHELL_COMMON_VERSION_H_
|
||||
#define EXTENSIONS_SHELL_COMMON_VERSION_H_
|
||||
|
||||
-#define PRODUCT_VERSION "@MAJOR@.@MINOR@.@BUILD@.@PATCH@"
|
||||
+#define PRODUCT_VERSION "@MAJOR@.@MINOR@"
|
||||
#define LAST_CHANGE "@LASTCHANGE@"
|
||||
|
||||
#endif // EXTENSIONS_SHELL_COMMON_VERSION_H_
|
||||
--
|
||||
2.4.3
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,32 +0,0 @@
|
||||
From 1a5a62b8033e0da98d28f95381c559de24945dbf Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Thu, 2 Apr 2015 12:44:23 +0200
|
||||
Subject: [PATCH 36/56] plugins: use cached copy of plugin description list at
|
||||
iridiumbrowsing.de
|
||||
|
||||
The list contains mimetype-to-plugin mappins, as well as blacklists
|
||||
for security-impeded old versions of plugins.
|
||||
|
||||
To avoid contacing Google, let the UA use the plugin list hosted at
|
||||
iridiumbrowser. The Iridium project re-gathers these lists on a
|
||||
regular basis.
|
||||
---
|
||||
chrome/browser/plugins/plugins_resource_service.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
|
||||
index 4dee543..338fe09 100644
|
||||
--- a/chrome/browser/plugins/plugins_resource_service.cc
|
||||
+++ b/chrome/browser/plugins/plugins_resource_service.cc
|
||||
@@ -24,7 +24,7 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
|
||||
const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
|
||||
|
||||
const char kPluginsServerUrl[] =
|
||||
- "https://www.gstatic.com/chrome/config/plugins_2/";
|
||||
+ "https://cache.iridiumbrowser.de/";
|
||||
|
||||
GURL GetPluginsServerURL() {
|
||||
std::string filename;
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From d949e985513cfac9b63bbb823fe6d3d255769170 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Sat, 8 Nov 2014 21:40:49 +0100
|
||||
Subject: [PATCH 26/56] prefs: use separate directory for config
|
||||
|
||||
Do not overwrite an existing Chromium configuration.
|
||||
---
|
||||
chrome/common/chrome_paths_linux.cc | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/chrome/common/chrome_paths_linux.cc b/chrome/common/chrome_paths_linux.cc
|
||||
index 91348fe..6a9f02d 100644
|
||||
--- a/chrome/common/chrome_paths_linux.cc
|
||||
+++ b/chrome/common/chrome_paths_linux.cc
|
||||
@@ -64,11 +64,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* result) {
|
||||
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("iridium");
|
||||
return true;
|
||||
}
|
||||
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From 48129805f22c69561912bcfe49c07ad291db1e8a Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Thu, 29 Jan 2015 10:36:43 +0100
|
||||
Subject: [PATCH 31/56] prefs: use system-provided preference skeleton
|
||||
|
||||
This patch makes it possible for distributions to have a global
|
||||
default preferences file in /etc/iridium-browser/preferences that get
|
||||
copied over to ~ when the user starts the program for the first time.
|
||||
---
|
||||
chrome/browser/first_run/first_run_internal_linux.cc | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/chrome/browser/first_run/first_run_internal_linux.cc b/chrome/browser/first_run/first_run_internal_linux.cc
|
||||
index f2441e2..abfafcd 100644
|
||||
--- a/chrome/browser/first_run/first_run_internal_linux.cc
|
||||
+++ b/chrome/browser/first_run/first_run_internal_linux.cc
|
||||
@@ -20,8 +20,12 @@ bool IsOrganicFirstRun() {
|
||||
base::FilePath MasterPrefsPath() {
|
||||
// The standard location of the master prefs is next to the chrome binary.
|
||||
base::FilePath master_prefs;
|
||||
+#ifndef ANDROID
|
||||
+ master_prefs = base::FilePath("/etc/iridium-browser");
|
||||
+#else
|
||||
if (!PathService::Get(base::DIR_EXE, &master_prefs))
|
||||
return base::FilePath();
|
||||
+#endif
|
||||
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
|
||||
}
|
||||
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
From d5385be91ed9d107bb8bd8f9db4b2e15ac9ea685 Mon Sep 17 00:00:00 2001
|
||||
From: Joachim Bauch <jojo@struktur.de>
|
||||
Date: Mon, 6 Jul 2015 17:17:20 +0200
|
||||
Subject: [PATCH 51/56] search: show blank tab for new tab page
|
||||
|
||||
Avoid loading the search page everytime, just show a blank one instead.
|
||||
|
||||
References: https://github.com/iridium-browser/iridium-browser/issues/32
|
||||
---
|
||||
chrome/browser/search/search.cc | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
|
||||
index 1a4b64d..b89eb2a 100644
|
||||
--- a/chrome/browser/search/search.cc
|
||||
+++ b/chrome/browser/search/search.cc
|
||||
@@ -231,6 +231,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
|
||||
return true;
|
||||
}
|
||||
|
||||
+#if 0
|
||||
// Returns whether |new_tab_url| can be used as a URL for the New Tab page.
|
||||
// NEW_TAB_URL_VALID means a valid URL; other enum values imply an invalid URL.
|
||||
NewTabURLState IsValidNewTabURL(Profile* profile, const GURL& new_tab_url) {
|
||||
@@ -244,6 +245,7 @@ NewTabURLState IsValidNewTabURL(Profile* profile, const GURL& new_tab_url) {
|
||||
return NEW_TAB_URL_BLOCKED;
|
||||
return NEW_TAB_URL_VALID;
|
||||
}
|
||||
+#endif
|
||||
|
||||
// Used to look up the URL to use for the New Tab page. Also tracks how we
|
||||
// arrived at that URL so it can be logged with UMA.
|
||||
@@ -252,6 +254,9 @@ struct NewTabURLDetails {
|
||||
: url(url), state(state) {}
|
||||
|
||||
static NewTabURLDetails ForProfile(Profile* profile) {
|
||||
+#if 1
|
||||
+ return NewTabURLDetails(GURL("about:blank"), NEW_TAB_URL_VALID);
|
||||
+#else
|
||||
const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
|
||||
|
||||
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
||||
@@ -277,6 +282,7 @@ struct NewTabURLDetails {
|
||||
// Use the local New Tab otherwise.
|
||||
return NewTabURLDetails(local_url, state);
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
GURL url;
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,610 +0,0 @@
|
||||
From a6bb3ea85d6abc5507938db5ded06e5eb36017b7 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Sun, 19 Oct 2014 14:49:10 +0200
|
||||
Subject: [PATCH 23/56] search_engines: add DuckDuckGo as selectable and
|
||||
default search engine
|
||||
|
||||
There is a lot of code pertaining to DefaultSearchEngine,
|
||||
default_search_engine, profile resetting, etc. etc.
|
||||
|
||||
The default default's seem to default to index 0 in the
|
||||
"engines_default" (or language-specific engines_XX) array, so
|
||||
prepending &duckduckgo yields the desired result, for now at least.
|
||||
---
|
||||
.../search_engines/prepopulated_engines.json | 11 ++
|
||||
components/search_engines/search_engine_type.h | 1 +
|
||||
.../template_url_prepopulate_data.cc | 218 ++++++++++-----------
|
||||
3 files changed, 121 insertions(+), 109 deletions(-)
|
||||
|
||||
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
|
||||
index 7a4eefe..16a336b 100644
|
||||
--- a/components/search_engines/prepopulated_engines.json
|
||||
+++ b/components/search_engines/prepopulated_engines.json
|
||||
@@ -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": "https://duckduckgo.com/",
|
||||
+ "type": "SEARCH_ENGINE_DUCKDUCKGO",
|
||||
+ "id": 11
|
||||
+ },
|
||||
+
|
||||
"aol": {
|
||||
"name": "AOL",
|
||||
"keyword": "aol.com",
|
||||
diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
|
||||
index d49c046..7dba2a7 100644
|
||||
--- a/components/search_engines/search_engine_type.h
|
||||
+++ b/components/search_engines/search_engine_type.h
|
||||
@@ -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.
|
||||
};
|
||||
|
||||
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
|
||||
index 1efa944..3eb2a61 100644
|
||||
--- a/components/search_engines/template_url_prepopulate_data.cc
|
||||
+++ b/components/search_engines/template_url_prepopulate_data.cc
|
||||
@@ -48,441 +48,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,
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,602 +0,0 @@
|
||||
From 003f6fa6928cc7da6653a609a939d39a9203e1d7 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Mon, 4 May 2015 15:27:37 +0200
|
||||
Subject: [PATCH 24/56] search_engines: add Qwant as selectable and default
|
||||
search engine
|
||||
|
||||
---
|
||||
.../search_engines/prepopulated_engines.json | 9 +
|
||||
components/search_engines/search_engine_type.h | 1 +
|
||||
.../template_url_prepopulate_data.cc | 218 ++++++++++-----------
|
||||
3 files changed, 119 insertions(+), 109 deletions(-)
|
||||
|
||||
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
|
||||
index 16a336b..0bbab112 100644
|
||||
--- a/components/search_engines/prepopulated_engines.json
|
||||
+++ b/components/search_engines/prepopulated_engines.json
|
||||
@@ -36,6 +36,15 @@
|
||||
// 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": {
|
||||
+ "qwant": {
|
||||
+ "name": "Qwant",
|
||||
+ "keyword": "qwant.com",
|
||||
+ "favicon_url": "https://qwant.com/favicon.ico",
|
||||
+ "search_url": "https://qwant.com/?q={searchTerms}&t=web",
|
||||
+ "new_tab_url": "https://qwant.com/",
|
||||
+ "type": "SEARCH_ENGINE_QWANT",
|
||||
+ "id": 12
|
||||
+ },
|
||||
"duckduckgo": {
|
||||
"name": "DuckDuckGo",
|
||||
"keyword": "duckduckgo.com",
|
||||
diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
|
||||
index 7dba2a7..2f52144 100644
|
||||
--- a/components/search_engines/search_engine_type.h
|
||||
+++ b/components/search_engines/search_engine_type.h
|
||||
@@ -59,6 +59,7 @@ enum SearchEngineType {
|
||||
SEARCH_ENGINE_YANDEX,
|
||||
SEARCH_ENGINE_ZOZNAM,
|
||||
SEARCH_ENGINE_DUCKDUCKGO,
|
||||
+ SEARCH_ENGINE_QWANT,
|
||||
SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro.
|
||||
};
|
||||
|
||||
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
|
||||
index 3eb2a61..d045bea 100644
|
||||
--- a/components/search_engines/template_url_prepopulate_data.cc
|
||||
+++ b/components/search_engines/template_url_prepopulate_data.cc
|
||||
@@ -48,441 +48,441 @@ namespace {
|
||||
|
||||
// Default (for countries with no better engine set)
|
||||
const PrepopulatedEngine* engines_default[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// United Arab Emirates
|
||||
const PrepopulatedEngine* engines_AE[] =
|
||||
- { &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
|
||||
// Albania
|
||||
const PrepopulatedEngine* engines_AL[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Argentina
|
||||
const PrepopulatedEngine* engines_AR[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_ar, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_ar, };
|
||||
|
||||
// Austria
|
||||
const PrepopulatedEngine* engines_AT[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_at, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_at, };
|
||||
|
||||
// Australia
|
||||
const PrepopulatedEngine* engines_AU[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_au, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_au, };
|
||||
|
||||
// Bosnia and Herzegovina
|
||||
const PrepopulatedEngine* engines_BA[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Belgium
|
||||
const PrepopulatedEngine* engines_BE[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, &yahoo_fr, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, &yahoo_fr, };
|
||||
|
||||
// Bulgaria
|
||||
const PrepopulatedEngine* engines_BG[] =
|
||||
- { &duckduckgo, &google, &bing, &ask, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &ask, };
|
||||
|
||||
// Bahrain
|
||||
const PrepopulatedEngine* engines_BH[] =
|
||||
- { &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
|
||||
// Burundi
|
||||
const PrepopulatedEngine* engines_BI[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Brunei
|
||||
const PrepopulatedEngine* engines_BN[] =
|
||||
- { &duckduckgo, &google, &yahoo_my, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_my, &bing, };
|
||||
|
||||
// Bolivia
|
||||
const PrepopulatedEngine* engines_BO[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Brazil
|
||||
const PrepopulatedEngine* engines_BR[] =
|
||||
- { &duckduckgo, &google, &ask_br, &bing, &yahoo_br, };
|
||||
+ { &qwant, &duckduckgo, &google, &ask_br, &bing, &yahoo_br, };
|
||||
|
||||
// Belarus
|
||||
const PrepopulatedEngine* engines_BY[] =
|
||||
- { &duckduckgo, &google, &yahoo_ru, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_ru, &bing, };
|
||||
|
||||
// Belize
|
||||
const PrepopulatedEngine* engines_BZ[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Canada
|
||||
const PrepopulatedEngine* engines_CA[] =
|
||||
- { &duckduckgo, &google, &bing, &ask, &yahoo_ca, &yahoo_qc, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &ask, &yahoo_ca, &yahoo_qc, };
|
||||
|
||||
// Switzerland
|
||||
const PrepopulatedEngine* engines_CH[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_ch, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_ch, };
|
||||
|
||||
// Chile
|
||||
const PrepopulatedEngine* engines_CL[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_cl, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_cl, };
|
||||
|
||||
// China
|
||||
const PrepopulatedEngine* engines_CN[] =
|
||||
- { &duckduckgo, &google, &baidu, &sogou, };
|
||||
+ { &qwant, &duckduckgo, &google, &baidu, &sogou, };
|
||||
|
||||
// Colombia
|
||||
const PrepopulatedEngine* engines_CO[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_co, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_co, };
|
||||
|
||||
// Costa Rica
|
||||
const PrepopulatedEngine* engines_CR[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Czech Republic
|
||||
const PrepopulatedEngine* engines_CZ[] =
|
||||
- { &duckduckgo, &google, &seznam, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &seznam, &bing, };
|
||||
|
||||
// Germany
|
||||
const PrepopulatedEngine* engines_DE[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_de };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_de };
|
||||
|
||||
// Denmark
|
||||
const PrepopulatedEngine* engines_DK[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_dk, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_dk, };
|
||||
|
||||
// Dominican Republic
|
||||
const PrepopulatedEngine* engines_DO[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Algeria
|
||||
const PrepopulatedEngine* engines_DZ[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
|
||||
// Ecuador
|
||||
const PrepopulatedEngine* engines_EC[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Estonia
|
||||
const PrepopulatedEngine* engines_EE[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Egypt
|
||||
const PrepopulatedEngine* engines_EG[] =
|
||||
- { &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
|
||||
// Spain
|
||||
const PrepopulatedEngine* engines_ES[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_es, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_es, };
|
||||
|
||||
// Faroe Islands
|
||||
const PrepopulatedEngine* engines_FO[] =
|
||||
- { &duckduckgo, &google, &bing, &ask, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &ask, };
|
||||
|
||||
// Finland
|
||||
const PrepopulatedEngine* engines_FI[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_fi, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_fi, };
|
||||
|
||||
// France
|
||||
const PrepopulatedEngine* engines_FR[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_fr, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_fr, };
|
||||
|
||||
// United Kingdom
|
||||
const PrepopulatedEngine* engines_GB[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_uk, &ask_uk, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_uk, &ask_uk, };
|
||||
|
||||
// Greece
|
||||
const PrepopulatedEngine* engines_GR[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_gr, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_gr, };
|
||||
|
||||
// Guatemala
|
||||
const PrepopulatedEngine* engines_GT[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Hong Kong
|
||||
const PrepopulatedEngine* engines_HK[] =
|
||||
- { &duckduckgo, &google, &yahoo_hk, &baidu, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_hk, &baidu, &bing, };
|
||||
|
||||
// Honduras
|
||||
const PrepopulatedEngine* engines_HN[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Croatia
|
||||
const PrepopulatedEngine* engines_HR[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Hungary
|
||||
const PrepopulatedEngine* engines_HU[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Indonesia
|
||||
const PrepopulatedEngine* engines_ID[] =
|
||||
- { &duckduckgo, &google, &yahoo_id, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_id, &bing, };
|
||||
|
||||
// Ireland
|
||||
const PrepopulatedEngine* engines_IE[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_uk, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_uk, };
|
||||
|
||||
// Israel
|
||||
const PrepopulatedEngine* engines_IL[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// India
|
||||
const PrepopulatedEngine* engines_IN[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_in, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_in, };
|
||||
|
||||
// Iraq
|
||||
const PrepopulatedEngine* engines_IQ[] =
|
||||
- { &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
|
||||
// Iran
|
||||
const PrepopulatedEngine* engines_IR[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Iceland
|
||||
const PrepopulatedEngine* engines_IS[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Italy
|
||||
const PrepopulatedEngine* engines_IT[] =
|
||||
- { &duckduckgo, &google, &virgilio, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &virgilio, &bing, };
|
||||
|
||||
// Jamaica
|
||||
const PrepopulatedEngine* engines_JM[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Jordan
|
||||
const PrepopulatedEngine* engines_JO[] =
|
||||
- { &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
|
||||
// Japan
|
||||
const PrepopulatedEngine* engines_JP[] =
|
||||
- { &duckduckgo, &google, &yahoo_jp, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_jp, &bing, };
|
||||
|
||||
// Kenya
|
||||
const PrepopulatedEngine* engines_KE[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Kuwait
|
||||
const PrepopulatedEngine* engines_KW[] =
|
||||
- { &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
|
||||
// South Korea
|
||||
const PrepopulatedEngine* engines_KR[] =
|
||||
- { &duckduckgo, &google, &naver, &daum, };
|
||||
+ { &qwant, &duckduckgo, &google, &naver, &daum, };
|
||||
|
||||
// Kazakhstan
|
||||
const PrepopulatedEngine* engines_KZ[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Lebanon
|
||||
const PrepopulatedEngine* engines_LB[] =
|
||||
- { &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
|
||||
// Liechtenstein
|
||||
const PrepopulatedEngine* engines_LI[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_de, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_de, };
|
||||
|
||||
// Lithuania
|
||||
const PrepopulatedEngine* engines_LT[] =
|
||||
- { &duckduckgo, &google, &bing, &yandex_ru, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yandex_ru, };
|
||||
|
||||
// Luxembourg
|
||||
const PrepopulatedEngine* engines_LU[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_fr, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_fr, };
|
||||
|
||||
// Latvia
|
||||
const PrepopulatedEngine* engines_LV[] =
|
||||
- { &duckduckgo, &google, &yandex_ru, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yandex_ru, &bing, };
|
||||
|
||||
// Libya
|
||||
const PrepopulatedEngine* engines_LY[] =
|
||||
- { &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
|
||||
// Morocco
|
||||
const PrepopulatedEngine* engines_MA[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
|
||||
// Monaco
|
||||
const PrepopulatedEngine* engines_MC[] =
|
||||
- { &duckduckgo, &google, &yahoo_fr, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_fr, &bing, };
|
||||
|
||||
// Moldova
|
||||
const PrepopulatedEngine* engines_MD[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Montenegro
|
||||
const PrepopulatedEngine* engines_ME[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Macedonia
|
||||
const PrepopulatedEngine* engines_MK[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Mexico
|
||||
const PrepopulatedEngine* engines_MX[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_mx, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_mx, };
|
||||
|
||||
// Malaysia
|
||||
const PrepopulatedEngine* engines_MY[] =
|
||||
- { &duckduckgo, &google, &yahoo_my, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_my, &bing, };
|
||||
|
||||
// Nicaragua
|
||||
const PrepopulatedEngine* engines_NI[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Netherlands
|
||||
const PrepopulatedEngine* engines_NL[] =
|
||||
- { &duckduckgo, &google, &yahoo_nl, &vinden, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_nl, &vinden, };
|
||||
|
||||
// Norway
|
||||
const PrepopulatedEngine* engines_NO[] =
|
||||
- { &duckduckgo, &google, &bing, &kvasir, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &kvasir, };
|
||||
|
||||
// New Zealand
|
||||
const PrepopulatedEngine* engines_NZ[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_nz, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_nz, };
|
||||
|
||||
// Oman
|
||||
const PrepopulatedEngine* engines_OM[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
|
||||
// Panama
|
||||
const PrepopulatedEngine* engines_PA[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Peru
|
||||
const PrepopulatedEngine* engines_PE[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_pe, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_pe, };
|
||||
|
||||
// Philippines
|
||||
const PrepopulatedEngine* engines_PH[] =
|
||||
- { &duckduckgo, &google, &yahoo_ph, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_ph, &bing, };
|
||||
|
||||
// Pakistan
|
||||
const PrepopulatedEngine* engines_PK[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Puerto Rico
|
||||
const PrepopulatedEngine* engines_PR[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Poland
|
||||
const PrepopulatedEngine* engines_PL[] =
|
||||
- { &duckduckgo, &google, &onet, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &onet, &bing, };
|
||||
|
||||
// Portugal
|
||||
const PrepopulatedEngine* engines_PT[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Paraguay
|
||||
const PrepopulatedEngine* engines_PY[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Qatar
|
||||
const PrepopulatedEngine* engines_QA[] =
|
||||
- { &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
|
||||
// Romania
|
||||
const PrepopulatedEngine* engines_RO[] =
|
||||
- { &duckduckgo, &google, &yahoo_ro, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_ro, &bing, };
|
||||
|
||||
// Serbia
|
||||
const PrepopulatedEngine* engines_RS[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Russia
|
||||
const PrepopulatedEngine* engines_RU[] =
|
||||
- { &duckduckgo, &google, &yandex_ru, &mail_ru, };
|
||||
+ { &qwant, &duckduckgo, &google, &yandex_ru, &mail_ru, };
|
||||
|
||||
// Rwanda
|
||||
const PrepopulatedEngine* engines_RW[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Saudi Arabia
|
||||
const PrepopulatedEngine* engines_SA[] =
|
||||
- { &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_maktoob, &bing, };
|
||||
|
||||
// Sweden
|
||||
const PrepopulatedEngine* engines_SE[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_se, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_se, };
|
||||
|
||||
// Singapore
|
||||
const PrepopulatedEngine* engines_SG[] =
|
||||
- { &duckduckgo, &google, &yahoo_sg, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_sg, &bing, };
|
||||
|
||||
// Slovenia
|
||||
const PrepopulatedEngine* engines_SI[] =
|
||||
- { &duckduckgo, &google, &najdi, &ask, };
|
||||
+ { &qwant, &duckduckgo, &google, &najdi, &ask, };
|
||||
|
||||
// Slovakia
|
||||
const PrepopulatedEngine* engines_SK[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// El Salvador
|
||||
const PrepopulatedEngine* engines_SV[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Syria
|
||||
const PrepopulatedEngine* engines_SY[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
|
||||
// Thailand
|
||||
const PrepopulatedEngine* engines_TH[] =
|
||||
- { &duckduckgo, &google, &yahoo_th, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_th, &bing, };
|
||||
|
||||
// Tunisia
|
||||
const PrepopulatedEngine* engines_TN[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
|
||||
// Turkey
|
||||
const PrepopulatedEngine* engines_TR[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_tr, &yandex_tr, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_tr, &yandex_tr, };
|
||||
|
||||
// Trinidad and Tobago
|
||||
const PrepopulatedEngine* engines_TT[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Taiwan
|
||||
const PrepopulatedEngine* engines_TW[] =
|
||||
- { &duckduckgo, &google, &yahoo_tw, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_tw, &bing, };
|
||||
|
||||
// Tanzania
|
||||
const PrepopulatedEngine* engines_TZ[] =
|
||||
- { &duckduckgo, &google, &yahoo, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo, &bing, };
|
||||
|
||||
// Ukraine
|
||||
const PrepopulatedEngine* engines_UA[] =
|
||||
- { &duckduckgo, &google, &yandex_ua, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yandex_ua, &bing, };
|
||||
|
||||
// United States
|
||||
const PrepopulatedEngine* engines_US[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, &aol, &ask, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, &aol, &ask, };
|
||||
|
||||
// Uruguay
|
||||
const PrepopulatedEngine* engines_UY[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Venezuela
|
||||
const PrepopulatedEngine* engines_VE[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_ve, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_ve, };
|
||||
|
||||
// Vietnam
|
||||
const PrepopulatedEngine* engines_VN[] =
|
||||
- { &duckduckgo, &google, &yahoo_vn, &bing, };
|
||||
+ { &qwant, &duckduckgo, &google, &yahoo_vn, &bing, };
|
||||
|
||||
// Yemen
|
||||
const PrepopulatedEngine* engines_YE[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo_maktoob, };
|
||||
|
||||
// South Africa
|
||||
const PrepopulatedEngine* engines_ZA[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, };
|
||||
+ { &qwant, &duckduckgo, &google, &bing, &yahoo, };
|
||||
|
||||
// Zimbabwe
|
||||
const PrepopulatedEngine* engines_ZW[] =
|
||||
- { &duckduckgo, &google, &bing, &yahoo, &ask, };
|
||||
+ { &qwant, &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,&duckduckgo,&google, &kvasir, &mail_ru,
|
||||
+ &bing, &daum,&qwant,&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,
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From 606f27028b55192d91b80872c849c519807a53dd Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Wed, 6 May 2015 14:13:00 +0200
|
||||
Subject: [PATCH 38/56] src: add comments for evil-looking code
|
||||
|
||||
A trk:193 alert would show whenever the Omnibar is set to use Google
|
||||
as search engine. When it does, it tries to find the most suitable TLD
|
||||
for your request.
|
||||
|
||||
Well, since we do not use Google as default search engine, this entry
|
||||
can be whitelisted, i.e. have no trk: prefix.
|
||||
---
|
||||
components/google/core/browser/google_url_tracker.cc | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/components/google/core/browser/google_url_tracker.cc b/components/google/core/browser/google_url_tracker.cc
|
||||
index fa0d140..3def0c2 100644
|
||||
--- a/components/google/core/browser/google_url_tracker.cc
|
||||
+++ b/components/google/core/browser/google_url_tracker.cc
|
||||
@@ -21,10 +21,19 @@
|
||||
#include "net/url_request/url_request_status.h"
|
||||
|
||||
|
||||
+/*
|
||||
+ * Developer "evmar" writes on
|
||||
+ * http://neugierig.org/software/chromium/notes/2009/12/iron.html :
|
||||
+ *
|
||||
+ * “the GoogleURLTracker class. This unforutnately-named class figures out
|
||||
+ * whether to use google.com or google.es for searches from the URL bar,”
|
||||
+ *
|
||||
+ * (So the naming problem was spotted, yet remains unfixed even today…)
|
||||
+ */
|
||||
const char GoogleURLTracker::kDefaultGoogleHomepage[] =
|
||||
"https://www.google.com/";
|
||||
const char GoogleURLTracker::kSearchDomainCheckURL[] =
|
||||
- "https://www.google.com/searchdomaincheck?format=domain&type=chrome";
|
||||
+/* trk:193: */ "https://www.google.com/searchdomaincheck?format=domain&type=chrome";
|
||||
|
||||
GoogleURLTracker::GoogleURLTracker(scoped_ptr<GoogleURLTrackerClient> client,
|
||||
Mode mode)
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From ba1d7cf47b2bbef3a2ccdbb242d8dc4502a4481e Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Mon, 26 Jan 2015 13:57:44 +0100
|
||||
Subject: [PATCH 30/56] src: use cached copy of safebrowsing lists at
|
||||
iridiumbrowser.de
|
||||
|
||||
To avoid contacing Google, let the UA use safebrowsing lists hosted at
|
||||
iridiumbrowser. The Iridium project re-gathers these lists on a
|
||||
regular basis.
|
||||
---
|
||||
chrome/browser/safe_browsing/client_side_model_loader.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc
|
||||
index 863f820..a37dc8c 100644
|
||||
--- a/chrome/browser/safe_browsing/client_side_model_loader.cc
|
||||
+++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
|
||||
@@ -31,7 +31,7 @@ namespace safe_browsing {
|
||||
const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
|
||||
const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
|
||||
const char ModelLoader::kClientModelUrlPrefix[] =
|
||||
- "https://ssl.gstatic.com/safebrowsing/csd/";
|
||||
+ "https://cache.iridiumbrowser.de/";
|
||||
const char ModelLoader::kClientModelNamePattern[] =
|
||||
"client_model_v5%s_variation_%d.pb";
|
||||
const char ModelLoader::kClientModelFinchExperiment[] =
|
||||
--
|
||||
2.4.3
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,62 @@
|
||||
iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
|
||||
iridium-browser/webrtc-disable-WebRTC-identity-store.patch
|
||||
iridium-browser/webrtc-generate-real-ephemeral-keys.patch
|
||||
iridium-browser/dns-send-IPv6-connectivity-probes-to-RIPE-DNS-rather.patch
|
||||
iridium-browser/profile-resetter-do-not-tick-send-settings-by-defaul.patch
|
||||
iridium-browser/browser-ui-disable-warning-about-missing-API-keys.patch
|
||||
iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
|
||||
iridium-browser/icons-change-sad-plugin-icon.patch
|
||||
iridium-browser/autofill-disable-autofill-download-manager.patch
|
||||
iridium-browser/prefs-disable-Use-a-web-service-to-help-resolve-navi.patch
|
||||
iridium-browser/prefs-disable-Use-a-prediction-service-to-help-compl.patch
|
||||
iridium-browser/prefs-enable-Send-a-Do-Not-Track-header.patch
|
||||
iridium-browser/prefs-disable-network-DNS-prediction.patch
|
||||
iridium-browser/prefs-block-third-party-cookies-by-default.patch
|
||||
iridium-browser/cloud-print-disable-in-prefs-and-component-loader.patch
|
||||
iridium-browser/prefs-disable-background-mode-by-default.patch
|
||||
iridium-browser/prefs-disable-hyperlink-auditing.patch
|
||||
iridium-browser/prefs-do-not-store-passwords-by-default.patch
|
||||
iridium-browser/prefs-only-keep-cookies-until-exit.patch
|
||||
iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
|
||||
iridium-browser/first_run-barf-if-metrics_reporting-is-activated.patch
|
||||
iridium-browser/prefs-disable-translation-service.patch
|
||||
iridium-browser/first_run-deactivate-autoupdate-globally.patch
|
||||
iridium-browser/build-build-the-sandbox-with-PIE.patch
|
||||
iridium-browser/updater-disable-auto-update.patch
|
||||
iridium-browser/plugin-do-not-load-any-system-provided-plugins-on-Wi.patch
|
||||
iridium-browser/plugin-only-load-plugins-from-user-s-domain-on-Mac-O.patch
|
||||
iridium-browser/Remove-EV-certificates.patch
|
||||
iridium-browser/spellchecker-flag-downloading-dictionary-from-Google.patch
|
||||
iridium-browser/google-cloud-messaging-disable-experiment-status-che.patch
|
||||
iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch
|
||||
iridium-browser/updater-disable-updater-pings.patch
|
||||
iridium-browser/safe_browsing-disable-incident-reporting.patch
|
||||
iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
|
||||
iridium-browser/safe_browsing-support-trk-prefix.patch
|
||||
iridium-browser/safe_browsing-disable-cookie-transmission.patch
|
||||
iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
|
||||
iridium-browser/promo-disable-Google-promotion-fetching.patch
|
||||
iridium-browser/hotword-disable-at-build-time-by-default.patch
|
||||
iridium-browser/google_now-disable-this.patch
|
||||
iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
|
||||
iridium-browser/extensions-always-show-component-extensions-in-the-e.patch
|
||||
iridium-browser/battery_status_service-disable-more-privacy-nightmar.patch
|
||||
iridium-browser/translate-disable-fetching-of-translate-languages-fr.patch
|
||||
|
||||
inox-patchset/disable-autofill-download-manager.patch
|
||||
inox-patchset/disable-default-extensions.patch
|
||||
inox-patchset/disable-first-run-behaviour.patch
|
||||
inox-patchset/disable-google-url-tracker.patch
|
||||
inox-patchset/disable-new-avatar-menu.patch
|
||||
inox-patchset/disable-translation-lang-fetch.patch
|
||||
inox-patchset/modify-default-prefs.patch
|
||||
inox-patchset/restore-classic-ntp.patch
|
||||
|
||||
debian/disable/promo.patch
|
||||
debian/disable/google-api-warning.patch
|
||||
debian/disable/default-browser-warning.patch
|
||||
debian/ps-print.patch
|
||||
debian/gpu-timeout.patch
|
||||
debian/chromedriver-revision.patch
|
||||
debian/system/vaapi.patch
|
||||
debian/webui.patch
|
||||
|
||||
Reference in New Issue
Block a user