Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 csagan5
|
ca366d39b9 | ||
|
csagan5
|
5cf852d97d | ||
|
csagan5
|
f2977bac96 | ||
|
csagan5
|
a162d5820e | ||
|
csagan5
|
95c717eb59 | ||
|
csagan5
|
873c245f6e | ||
|
csagan5
|
56fa92cbff | ||
|
csagan5
|
acc8cbb1e9 | ||
|
csagan5
|
c4bce0f449 | ||
|
csagan5
|
cf3313d156 | ||
|
csagan5
|
a6ffa85a0e | ||
|
csagan5
|
e940ac0998 |
+30
-1
@@ -1,8 +1,37 @@
|
||||
# 75.0.3770.50
|
||||
* disable dynamic module loading
|
||||
|
||||
# 74.0.3729.162
|
||||
* remove recent tabs signin
|
||||
|
||||
# 74.0.3729.154
|
||||
|
||||
# 74.0.3729.141
|
||||
|
||||
# 74.0.3729.122
|
||||
* remove more unnecessary permissions
|
||||
|
||||
# 74.0.3729.106
|
||||
* remove account/sync menu entries (fixes https://github.com/bromite/bromite/issues/285)
|
||||
* fix failed debug builds
|
||||
|
||||
# 74.0.3729.86
|
||||
* enable dark mode settings entry by default
|
||||
* fix permission request for Play services on reboot (fixes https://github.com/bromite/bromite/issues/281)
|
||||
|
||||
# 74.0.3729.80
|
||||
* increase minimum SDK version to 17 (Jelly Bean 4.2)
|
||||
* dropped obsolete patch for hyperlink auditing disable
|
||||
|
||||
# 73.0.3683.107
|
||||
* dropped patch to disable smooth scrolling
|
||||
* fixed custom tab intents issue (fixes https://github.com/bromite/bromite/issues/279)
|
||||
|
||||
# 73.0.3683.105
|
||||
* removed Fanboy's Annoyance List and Peter Lowe's adservers list from filters
|
||||
|
||||
# 73.0.3683.97
|
||||
* remove patch to hide NTP tiles
|
||||
* dropped redundant patch to hide NTP tiles (use home page + about:blank)
|
||||
|
||||
# 73.0.3683.88
|
||||
* add option to use home page as NTP
|
||||
|
||||
@@ -86,7 +86,7 @@ Yes, since version 69. While the desktop version of Chromium has an option to di
|
||||
* anti-fingerprinting mitigations for canvas, audio, client rects, webGL and sensor APIs
|
||||
* use fixed User-Agent to conceal real model and browser version
|
||||
* privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects
|
||||
* security enhancement patches from [AndroidHardening](https://github.com/AndroidHardening) project
|
||||
* security enhancement patches from [GrapheneOS](https://github.com/GrapheneOS) project
|
||||
|
||||
## Features not related to privacy
|
||||
* import/export bookmarks
|
||||
@@ -150,7 +150,7 @@ The patches are to be applied second the order specified in the `patches_list.tx
|
||||
* [Chromium project](https://www.chromium.org/Home) and developers
|
||||
* [Iridium project](https://github.com/iridium-browser) for some patches
|
||||
* [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) for some patches
|
||||
* [AndroidHardening](https://github.com/AndroidHardening) for some patches
|
||||
* [GrapheneOS](https://github.com/GrapheneOS) for some security patches
|
||||
* [Inox patchset](https://github.com/gcarq/inox-patchset) for some patches (via ungoogled-chromium)
|
||||
* [Brave Browser](https://github.com/brave/browser-android-tabs) for some patches
|
||||
* nochromo for the original adblock patch
|
||||
|
||||
+2795
-616
File diff suppressed because one or more lines are too long
@@ -18,16 +18,14 @@ Report AV1 as playable on Android
|
||||
third_party/libaom/source/config/linux/arm64/config/aom_config.h | 2 +-
|
||||
.../libaom/source/config/linux/generic/config/aom_config.asm | 2 +-
|
||||
third_party/libaom/source/config/linux/generic/config/aom_config.h | 2 +-
|
||||
third_party/libaom/source/config/linux/ia32/config/aom_config.asm | 2 +-
|
||||
third_party/libaom/source/config/linux/ia32/config/aom_config.h | 2 +-
|
||||
third_party/libaom/source/config/linux/x64/config/aom_config.asm | 2 +-
|
||||
third_party/libaom/source/config/linux/x64/config/aom_config.h | 2 +-
|
||||
17 files changed, 28 insertions(+), 17 deletions(-)
|
||||
15 files changed, 26 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc
|
||||
--- a/media/base/mime_util_internal.cc
|
||||
+++ b/media/base/mime_util_internal.cc
|
||||
@@ -540,9 +540,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(
|
||||
@@ -539,9 +539,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(
|
||||
case THEORA:
|
||||
return false;
|
||||
|
||||
@@ -45,7 +43,7 @@ diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc
|
||||
diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
|
||||
--- a/third_party/libaom/BUILD.gn
|
||||
+++ b/third_party/libaom/BUILD.gn
|
||||
@@ -74,7 +74,7 @@ if (enable_av1_decoder) {
|
||||
@@ -74,7 +74,7 @@ if (enable_libaom_decoder) {
|
||||
sources = aom_dsp_common_asm_sse2
|
||||
sources += aom_dsp_common_asm_ssse3
|
||||
sources += aom_ports_asm_x86
|
||||
@@ -54,7 +52,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
|
||||
include_dirs = libaom_include_dirs
|
||||
}
|
||||
|
||||
@@ -158,7 +158,7 @@ if (enable_av1_decoder) {
|
||||
@@ -158,7 +158,7 @@ if (enable_libaom_decoder) {
|
||||
configs += [ "//build/config/compiler:no_chromium_code" ]
|
||||
if (current_cpu == "arm") {
|
||||
configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
|
||||
@@ -62,8 +60,8 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
|
||||
+ cflags = [ "-mfpu=neon", "-fPIC" ]
|
||||
}
|
||||
configs += [ ":libaom_config" ]
|
||||
sources = aom_av1_common_intrin_neon
|
||||
@@ -198,6 +198,8 @@ if (enable_av1_decoder) {
|
||||
|
||||
@@ -203,6 +203,8 @@ if (enable_libaom_decoder) {
|
||||
if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
|
||||
cpu_arch_full == "arm-neon-cpu-detect") {
|
||||
deps += [ ":libaom_intrinsics_neon" ]
|
||||
@@ -71,11 +69,11 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
|
||||
+ sources += aom_ports_arm_sources
|
||||
}
|
||||
if (is_android) {
|
||||
deps += [ "//third_party/android_tools:cpu_features" ]
|
||||
deps += [ "//third_party/android_sdk:cpu_features" ]
|
||||
diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni
|
||||
--- a/third_party/libaom/libaom_srcs.gni
|
||||
+++ b/third_party/libaom/libaom_srcs.gni
|
||||
@@ -483,6 +483,11 @@ aom_mem_sources = [
|
||||
@@ -488,6 +488,11 @@ aom_mem_sources = [
|
||||
|
||||
aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ]
|
||||
|
||||
@@ -97,8 +95,8 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a
|
||||
-CONFIG_PIC equ 0
|
||||
+CONFIG_PIC equ 1
|
||||
CONFIG_RD_DEBUG equ 0
|
||||
CONFIG_REDUCED_ENCODER_BORDER equ 0
|
||||
CONFIG_RUNTIME_CPU_DETECT equ 1
|
||||
CONFIG_SHARED equ 0
|
||||
diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
|
||||
--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
|
||||
+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
|
||||
@@ -109,8 +107,8 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/a
|
||||
-#define CONFIG_PIC 0
|
||||
+#define CONFIG_PIC 1
|
||||
#define CONFIG_RD_DEBUG 0
|
||||
#define CONFIG_REDUCED_ENCODER_BORDER 0
|
||||
#define CONFIG_RUNTIME_CPU_DETECT 1
|
||||
#define CONFIG_SHARED 0
|
||||
diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
|
||||
--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
|
||||
+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
|
||||
@@ -121,8 +119,8 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.a
|
||||
-CONFIG_PIC equ 0
|
||||
+CONFIG_PIC equ 1
|
||||
CONFIG_RD_DEBUG equ 0
|
||||
CONFIG_REDUCED_ENCODER_BORDER equ 0
|
||||
CONFIG_RUNTIME_CPU_DETECT equ 0
|
||||
CONFIG_SHARED equ 0
|
||||
diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
|
||||
--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
|
||||
+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
|
||||
@@ -133,8 +131,8 @@ diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
|
||||
-#define CONFIG_PIC 0
|
||||
+#define CONFIG_PIC 1
|
||||
#define CONFIG_RD_DEBUG 0
|
||||
#define CONFIG_REDUCED_ENCODER_BORDER 0
|
||||
#define CONFIG_RUNTIME_CPU_DETECT 0
|
||||
#define CONFIG_SHARED 0
|
||||
diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
|
||||
--- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm
|
||||
+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
|
||||
@@ -145,8 +143,8 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/
|
||||
-CONFIG_PIC equ 0
|
||||
+CONFIG_PIC equ 1
|
||||
CONFIG_RD_DEBUG equ 0
|
||||
CONFIG_REDUCED_ENCODER_BORDER equ 0
|
||||
CONFIG_RUNTIME_CPU_DETECT equ 0
|
||||
CONFIG_SHARED equ 0
|
||||
diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h
|
||||
--- a/third_party/libaom/source/config/linux/arm/config/aom_config.h
|
||||
+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h
|
||||
@@ -157,8 +155,8 @@ diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/th
|
||||
-#define CONFIG_PIC 0
|
||||
+#define CONFIG_PIC 1
|
||||
#define CONFIG_RD_DEBUG 0
|
||||
#define CONFIG_REDUCED_ENCODER_BORDER 0
|
||||
#define CONFIG_RUNTIME_CPU_DETECT 0
|
||||
#define CONFIG_SHARED 0
|
||||
diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
|
||||
--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
|
||||
+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
|
||||
@@ -169,8 +167,8 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
|
||||
-CONFIG_PIC equ 0
|
||||
+CONFIG_PIC equ 1
|
||||
CONFIG_RD_DEBUG equ 0
|
||||
CONFIG_REDUCED_ENCODER_BORDER equ 0
|
||||
CONFIG_RUNTIME_CPU_DETECT equ 0
|
||||
CONFIG_SHARED equ 0
|
||||
diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
|
||||
--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h
|
||||
+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
|
||||
@@ -181,8 +179,8 @@ diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/
|
||||
-#define CONFIG_PIC 0
|
||||
+#define CONFIG_PIC 1
|
||||
#define CONFIG_RD_DEBUG 0
|
||||
#define CONFIG_REDUCED_ENCODER_BORDER 0
|
||||
#define CONFIG_RUNTIME_CPU_DETECT 0
|
||||
#define CONFIG_SHARED 0
|
||||
diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
|
||||
--- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm
|
||||
+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
|
||||
@@ -193,8 +191,8 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.as
|
||||
-CONFIG_PIC equ 0
|
||||
+CONFIG_PIC equ 1
|
||||
CONFIG_RD_DEBUG equ 0
|
||||
CONFIG_REDUCED_ENCODER_BORDER equ 0
|
||||
CONFIG_RUNTIME_CPU_DETECT equ 1
|
||||
CONFIG_SHARED equ 0
|
||||
diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h
|
||||
--- a/third_party/libaom/source/config/linux/generic/config/aom_config.h
|
||||
+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h
|
||||
@@ -205,32 +203,8 @@ diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h
|
||||
-#define CONFIG_PIC 0
|
||||
+#define CONFIG_PIC 1
|
||||
#define CONFIG_RD_DEBUG 0
|
||||
#define CONFIG_REDUCED_ENCODER_BORDER 0
|
||||
#define CONFIG_RUNTIME_CPU_DETECT 1
|
||||
diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm
|
||||
--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm
|
||||
+++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm
|
||||
@@ -35,7 +35,7 @@
|
||||
%define CONFIG_NORMAL_TILE_MODE 1
|
||||
%define CONFIG_ONE_PASS_SVM 0
|
||||
%define CONFIG_OS_SUPPORT 1
|
||||
-%define CONFIG_PIC 0
|
||||
+%define CONFIG_PIC 1
|
||||
%define CONFIG_RD_DEBUG 0
|
||||
%define CONFIG_REDUCED_ENCODER_BORDER 0
|
||||
%define CONFIG_RUNTIME_CPU_DETECT 1
|
||||
diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.h b/third_party/libaom/source/config/linux/ia32/config/aom_config.h
|
||||
--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.h
|
||||
+++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.h
|
||||
@@ -47,7 +47,7 @@
|
||||
#define CONFIG_NORMAL_TILE_MODE 1
|
||||
#define CONFIG_ONE_PASS_SVM 0
|
||||
#define CONFIG_OS_SUPPORT 1
|
||||
-#define CONFIG_PIC 0
|
||||
+#define CONFIG_PIC 1
|
||||
#define CONFIG_RD_DEBUG 0
|
||||
#define CONFIG_REDUCED_ENCODER_BORDER 0
|
||||
#define CONFIG_RUNTIME_CPU_DETECT 1
|
||||
#define CONFIG_SHARED 0
|
||||
diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
|
||||
--- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm
|
||||
+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
|
||||
@@ -241,8 +215,8 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/
|
||||
-%define CONFIG_PIC 0
|
||||
+%define CONFIG_PIC 1
|
||||
%define CONFIG_RD_DEBUG 0
|
||||
%define CONFIG_REDUCED_ENCODER_BORDER 0
|
||||
%define CONFIG_RUNTIME_CPU_DETECT 1
|
||||
%define CONFIG_SHARED 0
|
||||
diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h
|
||||
--- a/third_party/libaom/source/config/linux/x64/config/aom_config.h
|
||||
+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h
|
||||
@@ -253,8 +227,8 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/th
|
||||
-#define CONFIG_PIC 0
|
||||
+#define CONFIG_PIC 1
|
||||
#define CONFIG_RD_DEBUG 0
|
||||
#define CONFIG_REDUCED_ENCODER_BORDER 0
|
||||
#define CONFIG_RUNTIME_CPU_DETECT 1
|
||||
#define CONFIG_SHARED 0
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -316,7 +316,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Iraq
|
||||
@@ -406,7 +407,7 @@ const PrepopulatedEngine* const engines_IS[] = {
|
||||
@@ -405,7 +406,7 @@ const PrepopulatedEngine* const engines_IS[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -325,7 +325,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Italy
|
||||
@@ -414,7 +415,7 @@ const PrepopulatedEngine* const engines_IT[] = {
|
||||
@@ -413,7 +414,7 @@ const PrepopulatedEngine* const engines_IT[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -334,7 +334,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Jamaica
|
||||
@@ -422,7 +423,7 @@ const PrepopulatedEngine* const engines_JM[] = {
|
||||
@@ -421,7 +422,7 @@ const PrepopulatedEngine* const engines_JM[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -343,7 +343,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Jordan
|
||||
@@ -446,7 +447,7 @@ const PrepopulatedEngine* const engines_KE[] = {
|
||||
@@ -445,7 +446,7 @@ const PrepopulatedEngine* const engines_KE[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&yahoo,
|
||||
&bing,
|
||||
@@ -352,7 +352,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// South Korea
|
||||
@@ -478,14 +479,14 @@ const PrepopulatedEngine* const engines_LB[] = {
|
||||
@@ -477,14 +478,14 @@ const PrepopulatedEngine* const engines_LB[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -369,7 +369,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
};
|
||||
|
||||
@@ -501,7 +502,7 @@ const PrepopulatedEngine* const engines_LT[] = {
|
||||
@@ -500,7 +501,7 @@ const PrepopulatedEngine* const engines_LT[] = {
|
||||
const PrepopulatedEngine* const engines_LU[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
@@ -378,7 +378,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
};
|
||||
|
||||
@@ -534,7 +535,7 @@ const PrepopulatedEngine* const engines_MC[] = {
|
||||
@@ -533,7 +534,7 @@ const PrepopulatedEngine* const engines_MC[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -387,7 +387,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Moldova
|
||||
@@ -542,7 +543,7 @@ const PrepopulatedEngine* const engines_MD[] = {
|
||||
@@ -541,7 +542,7 @@ const PrepopulatedEngine* const engines_MD[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&yandex_ru,
|
||||
&mail_ru,
|
||||
@@ -396,7 +396,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Montenegro
|
||||
@@ -558,7 +559,7 @@ const PrepopulatedEngine* const engines_MK[] = {
|
||||
@@ -557,7 +558,7 @@ const PrepopulatedEngine* const engines_MK[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&yahoo,
|
||||
&bing,
|
||||
@@ -405,7 +405,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Mexico
|
||||
@@ -566,7 +567,7 @@ const PrepopulatedEngine* const engines_MX[] = {
|
||||
@@ -565,7 +566,7 @@ const PrepopulatedEngine* const engines_MX[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo_mx,
|
||||
@@ -414,7 +414,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Malaysia
|
||||
@@ -582,7 +583,7 @@ const PrepopulatedEngine* const engines_NI[] = {
|
||||
@@ -581,7 +582,7 @@ const PrepopulatedEngine* const engines_NI[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -423,7 +423,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Netherlands
|
||||
@@ -590,7 +591,7 @@ const PrepopulatedEngine* const engines_NL[] = {
|
||||
@@ -589,7 +590,7 @@ const PrepopulatedEngine* const engines_NL[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo_nl,
|
||||
@@ -432,7 +432,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Norway
|
||||
@@ -598,14 +599,14 @@ const PrepopulatedEngine* const engines_NO[] = {
|
||||
@@ -597,14 +598,14 @@ const PrepopulatedEngine* const engines_NO[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -449,7 +449,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_nz,
|
||||
};
|
||||
|
||||
@@ -622,7 +623,7 @@ const PrepopulatedEngine* const engines_PA[] = {
|
||||
@@ -621,7 +622,7 @@ const PrepopulatedEngine* const engines_PA[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -458,7 +458,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Peru
|
||||
@@ -630,7 +631,7 @@ const PrepopulatedEngine* const engines_PE[] = {
|
||||
@@ -629,7 +630,7 @@ const PrepopulatedEngine* const engines_PE[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&yahoo_pe,
|
||||
&bing,
|
||||
@@ -467,7 +467,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Philippines
|
||||
@@ -638,7 +639,7 @@ const PrepopulatedEngine* const engines_PH[] = {
|
||||
@@ -637,7 +638,7 @@ const PrepopulatedEngine* const engines_PH[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&yahoo_ph,
|
||||
&bing,
|
||||
@@ -476,7 +476,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Pakistan
|
||||
@@ -654,7 +655,7 @@ const PrepopulatedEngine* const engines_PL[] = {
|
||||
@@ -653,7 +654,7 @@ const PrepopulatedEngine* const engines_PL[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -485,7 +485,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Puerto Rico
|
||||
@@ -662,7 +663,7 @@ const PrepopulatedEngine* const engines_PR[] = {
|
||||
@@ -661,7 +662,7 @@ const PrepopulatedEngine* const engines_PR[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -494,7 +494,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Portugal
|
||||
@@ -670,7 +671,7 @@ const PrepopulatedEngine* const engines_PT[] = {
|
||||
@@ -669,7 +670,7 @@ const PrepopulatedEngine* const engines_PT[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -503,7 +503,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Paraguay
|
||||
@@ -678,7 +679,7 @@ const PrepopulatedEngine* const engines_PY[] = {
|
||||
@@ -677,7 +678,7 @@ const PrepopulatedEngine* const engines_PY[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -512,7 +512,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Qatar
|
||||
@@ -694,7 +695,7 @@ const PrepopulatedEngine* const engines_RO[] = {
|
||||
@@ -693,7 +694,7 @@ const PrepopulatedEngine* const engines_RO[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -521,7 +521,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Serbia
|
||||
@@ -702,7 +703,7 @@ const PrepopulatedEngine* const engines_RS[] = {
|
||||
@@ -701,7 +702,7 @@ const PrepopulatedEngine* const engines_RS[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&yahoo,
|
||||
&bing,
|
||||
@@ -530,7 +530,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Russia
|
||||
@@ -734,7 +735,7 @@ const PrepopulatedEngine* const engines_SE[] = {
|
||||
@@ -733,7 +734,7 @@ const PrepopulatedEngine* const engines_SE[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo_se,
|
||||
@@ -539,7 +539,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Singapore
|
||||
@@ -750,7 +751,7 @@ const PrepopulatedEngine* const engines_SI[] = {
|
||||
@@ -749,7 +750,7 @@ const PrepopulatedEngine* const engines_SI[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -548,7 +548,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Slovakia
|
||||
@@ -758,7 +759,7 @@ const PrepopulatedEngine* const engines_SK[] = {
|
||||
@@ -757,7 +758,7 @@ const PrepopulatedEngine* const engines_SK[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -557,7 +557,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// El Salvador
|
||||
@@ -766,7 +767,7 @@ const PrepopulatedEngine* const engines_SV[] = {
|
||||
@@ -765,7 +766,7 @@ const PrepopulatedEngine* const engines_SV[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -566,7 +566,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Syria
|
||||
@@ -806,7 +807,7 @@ const PrepopulatedEngine* const engines_TT[] = {
|
||||
@@ -805,7 +806,7 @@ const PrepopulatedEngine* const engines_TT[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -575,7 +575,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Taiwan
|
||||
@@ -838,7 +839,7 @@ const PrepopulatedEngine* const engines_US[] = {
|
||||
@@ -837,7 +838,7 @@ const PrepopulatedEngine* const engines_US[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -584,7 +584,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Uruguay
|
||||
@@ -846,7 +847,7 @@ const PrepopulatedEngine* const engines_UY[] = {
|
||||
@@ -845,7 +846,7 @@ const PrepopulatedEngine* const engines_UY[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -593,7 +593,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Venezuela
|
||||
@@ -854,7 +855,7 @@ const PrepopulatedEngine* const engines_VE[] = {
|
||||
@@ -853,7 +854,7 @@ const PrepopulatedEngine* const engines_VE[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&yahoo_ve,
|
||||
&bing,
|
||||
@@ -602,7 +602,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Vietnam
|
||||
@@ -878,7 +879,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
|
||||
@@ -877,7 +878,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
|
||||
&googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
@@ -611,7 +611,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
};
|
||||
|
||||
// Zimbabwe
|
||||
@@ -898,7 +899,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
|
||||
@@ -897,7 +898,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
|
||||
&bing,
|
||||
&coccoc,
|
||||
&daum,
|
||||
|
||||
@@ -5,24 +5,15 @@ Subject: Add English-only search engine
|
||||
Add a Google search engine that forces languages to English,
|
||||
disable from all its searches RLZ and field experiments querystring parameters.
|
||||
---
|
||||
.../search_engines/prepopulated_engines.json | 23 ++-
|
||||
.../search_engines/prepopulated_engines.json | 21 ++
|
||||
components/search_engines/search_engine_type.h | 1 +
|
||||
.../template_url_prepopulate_data.cc | 218 ++++++++++-----------
|
||||
3 files changed, 132 insertions(+), 110 deletions(-)
|
||||
3 files changed, 131 insertions(+), 109 deletions(-)
|
||||
|
||||
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
|
||||
--- a/components/search_engines/prepopulated_engines.json
|
||||
+++ b/components/search_engines/prepopulated_engines.json
|
||||
@@ -28,7 +28,7 @@
|
||||
// Increment this if you change the data in ways that mean users with
|
||||
// existing data should get a new version. Otherwise, existing data may
|
||||
// continue to be used and updates made here will not always appear.
|
||||
- "kCurrentDataVersion": 111
|
||||
+ "kCurrentDataVersion": 112
|
||||
},
|
||||
|
||||
// The following engines are included in country lists and are added to the
|
||||
@@ -126,6 +126,27 @@
|
||||
@@ -127,6 +127,27 @@
|
||||
"id": 1
|
||||
},
|
||||
|
||||
@@ -472,7 +463,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -395,7 +395,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
|
||||
@@ -395,14 +395,14 @@ const PrepopulatedEngine* const engines_IQ[] = {
|
||||
|
||||
// Iran
|
||||
const PrepopulatedEngine* const engines_IR[] = {
|
||||
@@ -480,8 +471,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
+ &googleen, &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
&parsijoo,
|
||||
@@ -403,7 +403,7 @@ const PrepopulatedEngine* const engines_IR[] = {
|
||||
};
|
||||
|
||||
// Iceland
|
||||
const PrepopulatedEngine* const engines_IS[] = {
|
||||
@@ -490,7 +480,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IS[] = {
|
||||
@@ -410,7 +410,7 @@ const PrepopulatedEngine* const engines_IS[] = {
|
||||
|
||||
// Italy
|
||||
const PrepopulatedEngine* const engines_IT[] = {
|
||||
@@ -499,7 +489,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -419,7 +419,7 @@ const PrepopulatedEngine* const engines_IT[] = {
|
||||
@@ -418,7 +418,7 @@ const PrepopulatedEngine* const engines_IT[] = {
|
||||
|
||||
// Jamaica
|
||||
const PrepopulatedEngine* const engines_JM[] = {
|
||||
@@ -508,7 +498,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -427,7 +427,7 @@ const PrepopulatedEngine* const engines_JM[] = {
|
||||
@@ -426,7 +426,7 @@ const PrepopulatedEngine* const engines_JM[] = {
|
||||
|
||||
// Jordan
|
||||
const PrepopulatedEngine* const engines_JO[] = {
|
||||
@@ -517,7 +507,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -435,7 +435,7 @@ const PrepopulatedEngine* const engines_JO[] = {
|
||||
@@ -434,7 +434,7 @@ const PrepopulatedEngine* const engines_JO[] = {
|
||||
|
||||
// Japan
|
||||
const PrepopulatedEngine* const engines_JP[] = {
|
||||
@@ -526,7 +516,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_jp,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -443,7 +443,7 @@ const PrepopulatedEngine* const engines_JP[] = {
|
||||
@@ -442,7 +442,7 @@ const PrepopulatedEngine* const engines_JP[] = {
|
||||
|
||||
// Kenya
|
||||
const PrepopulatedEngine* const engines_KE[] = {
|
||||
@@ -535,7 +525,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -451,7 +451,7 @@ const PrepopulatedEngine* const engines_KE[] = {
|
||||
@@ -450,7 +450,7 @@ const PrepopulatedEngine* const engines_KE[] = {
|
||||
|
||||
// South Korea
|
||||
const PrepopulatedEngine* const engines_KR[] = {
|
||||
@@ -544,7 +534,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&naver,
|
||||
&daum,
|
||||
&bing,
|
||||
@@ -459,7 +459,7 @@ const PrepopulatedEngine* const engines_KR[] = {
|
||||
@@ -458,7 +458,7 @@ const PrepopulatedEngine* const engines_KR[] = {
|
||||
|
||||
// Kuwait
|
||||
const PrepopulatedEngine* const engines_KW[] = {
|
||||
@@ -553,7 +543,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&ask,
|
||||
@@ -467,7 +467,7 @@ const PrepopulatedEngine* const engines_KW[] = {
|
||||
@@ -466,7 +466,7 @@ const PrepopulatedEngine* const engines_KW[] = {
|
||||
|
||||
// Kazakhstan
|
||||
const PrepopulatedEngine* const engines_KZ[] = {
|
||||
@@ -562,7 +552,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_kz,
|
||||
&mail_ru,
|
||||
&bing,
|
||||
@@ -475,7 +475,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
|
||||
@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
|
||||
|
||||
// Lebanon
|
||||
const PrepopulatedEngine* const engines_LB[] = {
|
||||
@@ -571,7 +561,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_LB[] = {
|
||||
@@ -482,7 +482,7 @@ const PrepopulatedEngine* const engines_LB[] = {
|
||||
|
||||
// Liechtenstein
|
||||
const PrepopulatedEngine* const engines_LI[] = {
|
||||
@@ -580,7 +570,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
&yahoo,
|
||||
@@ -491,7 +491,7 @@ const PrepopulatedEngine* const engines_LI[] = {
|
||||
@@ -490,7 +490,7 @@ const PrepopulatedEngine* const engines_LI[] = {
|
||||
|
||||
// Lithuania
|
||||
const PrepopulatedEngine* const engines_LT[] = {
|
||||
@@ -589,7 +579,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -499,7 +499,7 @@ const PrepopulatedEngine* const engines_LT[] = {
|
||||
@@ -498,7 +498,7 @@ const PrepopulatedEngine* const engines_LT[] = {
|
||||
|
||||
// Luxembourg
|
||||
const PrepopulatedEngine* const engines_LU[] = {
|
||||
@@ -598,7 +588,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
&yahoo,
|
||||
@@ -507,7 +507,7 @@ const PrepopulatedEngine* const engines_LU[] = {
|
||||
@@ -506,7 +506,7 @@ const PrepopulatedEngine* const engines_LU[] = {
|
||||
|
||||
// Latvia
|
||||
const PrepopulatedEngine* const engines_LV[] = {
|
||||
@@ -607,7 +597,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
&yahoo,
|
||||
@@ -515,7 +515,7 @@ const PrepopulatedEngine* const engines_LV[] = {
|
||||
@@ -514,7 +514,7 @@ const PrepopulatedEngine* const engines_LV[] = {
|
||||
|
||||
// Libya
|
||||
const PrepopulatedEngine* const engines_LY[] = {
|
||||
@@ -616,7 +606,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_com,
|
||||
@@ -523,7 +523,7 @@ const PrepopulatedEngine* const engines_LY[] = {
|
||||
@@ -522,7 +522,7 @@ const PrepopulatedEngine* const engines_LY[] = {
|
||||
|
||||
// Morocco
|
||||
const PrepopulatedEngine* const engines_MA[] = {
|
||||
@@ -625,7 +615,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -531,7 +531,7 @@ const PrepopulatedEngine* const engines_MA[] = {
|
||||
@@ -530,7 +530,7 @@ const PrepopulatedEngine* const engines_MA[] = {
|
||||
|
||||
// Monaco
|
||||
const PrepopulatedEngine* const engines_MC[] = {
|
||||
@@ -634,7 +624,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -539,7 +539,7 @@ const PrepopulatedEngine* const engines_MC[] = {
|
||||
@@ -538,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = {
|
||||
|
||||
// Moldova
|
||||
const PrepopulatedEngine* const engines_MD[] = {
|
||||
@@ -643,7 +633,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_ru,
|
||||
&mail_ru,
|
||||
&duckduckgo,
|
||||
@@ -547,7 +547,7 @@ const PrepopulatedEngine* const engines_MD[] = {
|
||||
@@ -546,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = {
|
||||
|
||||
// Montenegro
|
||||
const PrepopulatedEngine* const engines_ME[] = {
|
||||
@@ -652,7 +642,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_ME[] = {
|
||||
@@ -554,7 +554,7 @@ const PrepopulatedEngine* const engines_ME[] = {
|
||||
|
||||
// Macedonia
|
||||
const PrepopulatedEngine* const engines_MK[] = {
|
||||
@@ -661,7 +651,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_MK[] = {
|
||||
@@ -562,7 +562,7 @@ const PrepopulatedEngine* const engines_MK[] = {
|
||||
|
||||
// Mexico
|
||||
const PrepopulatedEngine* const engines_MX[] = {
|
||||
@@ -670,7 +660,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_mx,
|
||||
&duckduckgo,
|
||||
@@ -571,7 +571,7 @@ const PrepopulatedEngine* const engines_MX[] = {
|
||||
@@ -570,7 +570,7 @@ const PrepopulatedEngine* const engines_MX[] = {
|
||||
|
||||
// Malaysia
|
||||
const PrepopulatedEngine* const engines_MY[] = {
|
||||
@@ -679,7 +669,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_my,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -579,7 +579,7 @@ const PrepopulatedEngine* const engines_MY[] = {
|
||||
@@ -578,7 +578,7 @@ const PrepopulatedEngine* const engines_MY[] = {
|
||||
|
||||
// Nicaragua
|
||||
const PrepopulatedEngine* const engines_NI[] = {
|
||||
@@ -688,7 +678,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -587,7 +587,7 @@ const PrepopulatedEngine* const engines_NI[] = {
|
||||
@@ -586,7 +586,7 @@ const PrepopulatedEngine* const engines_NI[] = {
|
||||
|
||||
// Netherlands
|
||||
const PrepopulatedEngine* const engines_NL[] = {
|
||||
@@ -697,7 +687,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_nl,
|
||||
&duckduckgo,
|
||||
@@ -595,7 +595,7 @@ const PrepopulatedEngine* const engines_NL[] = {
|
||||
@@ -594,7 +594,7 @@ const PrepopulatedEngine* const engines_NL[] = {
|
||||
|
||||
// Norway
|
||||
const PrepopulatedEngine* const engines_NO[] = {
|
||||
@@ -706,7 +696,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -603,7 +603,7 @@ const PrepopulatedEngine* const engines_NO[] = {
|
||||
@@ -602,7 +602,7 @@ const PrepopulatedEngine* const engines_NO[] = {
|
||||
|
||||
// New Zealand
|
||||
const PrepopulatedEngine* const engines_NZ[] = {
|
||||
@@ -715,7 +705,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
&yahoo_nz,
|
||||
@@ -611,7 +611,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
|
||||
@@ -610,7 +610,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
|
||||
|
||||
// Oman
|
||||
const PrepopulatedEngine* const engines_OM[] = {
|
||||
@@ -724,7 +714,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&ask,
|
||||
@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_OM[] = {
|
||||
@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_OM[] = {
|
||||
|
||||
// Panama
|
||||
const PrepopulatedEngine* const engines_PA[] = {
|
||||
@@ -733,7 +723,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_PA[] = {
|
||||
@@ -626,7 +626,7 @@ const PrepopulatedEngine* const engines_PA[] = {
|
||||
|
||||
// Peru
|
||||
const PrepopulatedEngine* const engines_PE[] = {
|
||||
@@ -742,7 +732,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_pe,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -635,7 +635,7 @@ const PrepopulatedEngine* const engines_PE[] = {
|
||||
@@ -634,7 +634,7 @@ const PrepopulatedEngine* const engines_PE[] = {
|
||||
|
||||
// Philippines
|
||||
const PrepopulatedEngine* const engines_PH[] = {
|
||||
@@ -751,7 +741,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_ph,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -643,7 +643,7 @@ const PrepopulatedEngine* const engines_PH[] = {
|
||||
@@ -642,7 +642,7 @@ const PrepopulatedEngine* const engines_PH[] = {
|
||||
|
||||
// Pakistan
|
||||
const PrepopulatedEngine* const engines_PK[] = {
|
||||
@@ -760,7 +750,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -651,7 +651,7 @@ const PrepopulatedEngine* const engines_PK[] = {
|
||||
@@ -650,7 +650,7 @@ const PrepopulatedEngine* const engines_PK[] = {
|
||||
|
||||
// Poland
|
||||
const PrepopulatedEngine* const engines_PL[] = {
|
||||
@@ -769,7 +759,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -659,7 +659,7 @@ const PrepopulatedEngine* const engines_PL[] = {
|
||||
@@ -658,7 +658,7 @@ const PrepopulatedEngine* const engines_PL[] = {
|
||||
|
||||
// Puerto Rico
|
||||
const PrepopulatedEngine* const engines_PR[] = {
|
||||
@@ -778,7 +768,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -667,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = {
|
||||
@@ -666,7 +666,7 @@ const PrepopulatedEngine* const engines_PR[] = {
|
||||
|
||||
// Portugal
|
||||
const PrepopulatedEngine* const engines_PT[] = {
|
||||
@@ -787,7 +777,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -675,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = {
|
||||
@@ -674,7 +674,7 @@ const PrepopulatedEngine* const engines_PT[] = {
|
||||
|
||||
// Paraguay
|
||||
const PrepopulatedEngine* const engines_PY[] = {
|
||||
@@ -796,7 +786,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -683,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = {
|
||||
@@ -682,7 +682,7 @@ const PrepopulatedEngine* const engines_PY[] = {
|
||||
|
||||
// Qatar
|
||||
const PrepopulatedEngine* const engines_QA[] = {
|
||||
@@ -805,7 +795,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&ask,
|
||||
@@ -691,7 +691,7 @@ const PrepopulatedEngine* const engines_QA[] = {
|
||||
@@ -690,7 +690,7 @@ const PrepopulatedEngine* const engines_QA[] = {
|
||||
|
||||
// Romania
|
||||
const PrepopulatedEngine* const engines_RO[] = {
|
||||
@@ -814,7 +804,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = {
|
||||
@@ -698,7 +698,7 @@ const PrepopulatedEngine* const engines_RO[] = {
|
||||
|
||||
// Serbia
|
||||
const PrepopulatedEngine* const engines_RS[] = {
|
||||
@@ -823,7 +813,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -708,14 +708,14 @@ const PrepopulatedEngine* const engines_RS[] = {
|
||||
@@ -707,14 +707,14 @@ const PrepopulatedEngine* const engines_RS[] = {
|
||||
// Russia
|
||||
const PrepopulatedEngine* const engines_RU[] = {
|
||||
&yandex_ru,
|
||||
@@ -840,7 +830,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -723,7 +723,7 @@ const PrepopulatedEngine* const engines_RW[] = {
|
||||
@@ -722,7 +722,7 @@ const PrepopulatedEngine* const engines_RW[] = {
|
||||
|
||||
// Saudi Arabia
|
||||
const PrepopulatedEngine* const engines_SA[] = {
|
||||
@@ -849,7 +839,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_com,
|
||||
@@ -731,7 +731,7 @@ const PrepopulatedEngine* const engines_SA[] = {
|
||||
@@ -730,7 +730,7 @@ const PrepopulatedEngine* const engines_SA[] = {
|
||||
|
||||
// Sweden
|
||||
const PrepopulatedEngine* const engines_SE[] = {
|
||||
@@ -858,7 +848,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_se,
|
||||
&duckduckgo,
|
||||
@@ -739,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = {
|
||||
@@ -738,7 +738,7 @@ const PrepopulatedEngine* const engines_SE[] = {
|
||||
|
||||
// Singapore
|
||||
const PrepopulatedEngine* const engines_SG[] = {
|
||||
@@ -867,7 +857,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_sg,
|
||||
&yandex_com,
|
||||
@@ -747,7 +747,7 @@ const PrepopulatedEngine* const engines_SG[] = {
|
||||
@@ -746,7 +746,7 @@ const PrepopulatedEngine* const engines_SG[] = {
|
||||
|
||||
// Slovenia
|
||||
const PrepopulatedEngine* const engines_SI[] = {
|
||||
@@ -876,7 +866,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -755,7 +755,7 @@ const PrepopulatedEngine* const engines_SI[] = {
|
||||
@@ -754,7 +754,7 @@ const PrepopulatedEngine* const engines_SI[] = {
|
||||
|
||||
// Slovakia
|
||||
const PrepopulatedEngine* const engines_SK[] = {
|
||||
@@ -885,7 +875,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -763,7 +763,7 @@ const PrepopulatedEngine* const engines_SK[] = {
|
||||
@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_SK[] = {
|
||||
|
||||
// El Salvador
|
||||
const PrepopulatedEngine* const engines_SV[] = {
|
||||
@@ -894,7 +884,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = {
|
||||
@@ -770,7 +770,7 @@ const PrepopulatedEngine* const engines_SV[] = {
|
||||
|
||||
// Syria
|
||||
const PrepopulatedEngine* const engines_SY[] = {
|
||||
@@ -903,7 +893,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -779,7 +779,7 @@ const PrepopulatedEngine* const engines_SY[] = {
|
||||
@@ -778,7 +778,7 @@ const PrepopulatedEngine* const engines_SY[] = {
|
||||
|
||||
// Thailand
|
||||
const PrepopulatedEngine* const engines_TH[] = {
|
||||
@@ -912,7 +902,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_th,
|
||||
&bing,
|
||||
&ask,
|
||||
@@ -787,7 +787,7 @@ const PrepopulatedEngine* const engines_TH[] = {
|
||||
@@ -786,7 +786,7 @@ const PrepopulatedEngine* const engines_TH[] = {
|
||||
|
||||
// Tunisia
|
||||
const PrepopulatedEngine* const engines_TN[] = {
|
||||
@@ -921,7 +911,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -795,7 +795,7 @@ const PrepopulatedEngine* const engines_TN[] = {
|
||||
@@ -794,7 +794,7 @@ const PrepopulatedEngine* const engines_TN[] = {
|
||||
|
||||
// Turkey
|
||||
const PrepopulatedEngine* const engines_TR[] = {
|
||||
@@ -930,7 +920,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_tr,
|
||||
&yahoo_tr,
|
||||
&bing,
|
||||
@@ -803,7 +803,7 @@ const PrepopulatedEngine* const engines_TR[] = {
|
||||
@@ -802,7 +802,7 @@ const PrepopulatedEngine* const engines_TR[] = {
|
||||
|
||||
// Trinidad and Tobago
|
||||
const PrepopulatedEngine* const engines_TT[] = {
|
||||
@@ -939,7 +929,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -811,7 +811,7 @@ const PrepopulatedEngine* const engines_TT[] = {
|
||||
@@ -810,7 +810,7 @@ const PrepopulatedEngine* const engines_TT[] = {
|
||||
|
||||
// Taiwan
|
||||
const PrepopulatedEngine* const engines_TW[] = {
|
||||
@@ -948,7 +938,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_tw,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -819,7 +819,7 @@ const PrepopulatedEngine* const engines_TW[] = {
|
||||
@@ -818,7 +818,7 @@ const PrepopulatedEngine* const engines_TW[] = {
|
||||
|
||||
// Tanzania
|
||||
const PrepopulatedEngine* const engines_TZ[] = {
|
||||
@@ -957,7 +947,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -827,7 +827,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
|
||||
@@ -826,7 +826,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
|
||||
|
||||
// Ukraine
|
||||
const PrepopulatedEngine* const engines_UA[] = {
|
||||
@@ -966,7 +956,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_ua,
|
||||
&mail_ru,
|
||||
&bing,
|
||||
@@ -835,7 +835,7 @@ const PrepopulatedEngine* const engines_UA[] = {
|
||||
@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_UA[] = {
|
||||
|
||||
// United States
|
||||
const PrepopulatedEngine* const engines_US[] = {
|
||||
@@ -975,7 +965,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -843,7 +843,7 @@ const PrepopulatedEngine* const engines_US[] = {
|
||||
@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_US[] = {
|
||||
|
||||
// Uruguay
|
||||
const PrepopulatedEngine* const engines_UY[] = {
|
||||
@@ -984,7 +974,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_UY[] = {
|
||||
@@ -850,7 +850,7 @@ const PrepopulatedEngine* const engines_UY[] = {
|
||||
|
||||
// Venezuela
|
||||
const PrepopulatedEngine* const engines_VE[] = {
|
||||
@@ -993,7 +983,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_ve,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -859,7 +859,7 @@ const PrepopulatedEngine* const engines_VE[] = {
|
||||
@@ -858,7 +858,7 @@ const PrepopulatedEngine* const engines_VE[] = {
|
||||
|
||||
// Vietnam
|
||||
const PrepopulatedEngine* const engines_VN[] = {
|
||||
@@ -1002,7 +992,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&coccoc,
|
||||
&bing,
|
||||
&yahoo_vn,
|
||||
@@ -867,7 +867,7 @@ const PrepopulatedEngine* const engines_VN[] = {
|
||||
@@ -866,7 +866,7 @@ const PrepopulatedEngine* const engines_VN[] = {
|
||||
|
||||
// Yemen
|
||||
const PrepopulatedEngine* const engines_YE[] = {
|
||||
@@ -1011,7 +1001,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&baidu,
|
||||
@@ -875,7 +875,7 @@ const PrepopulatedEngine* const engines_YE[] = {
|
||||
@@ -874,7 +874,7 @@ const PrepopulatedEngine* const engines_YE[] = {
|
||||
|
||||
// South Africa
|
||||
const PrepopulatedEngine* const engines_ZA[] = {
|
||||
@@ -1020,7 +1010,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -883,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
|
||||
@@ -882,7 +882,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
|
||||
|
||||
// Zimbabwe
|
||||
const PrepopulatedEngine* const engines_ZW[] = {
|
||||
@@ -1029,7 +1019,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&baidu,
|
||||
@@ -899,7 +899,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
|
||||
@@ -898,7 +898,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
|
||||
&coccoc,
|
||||
&daum,
|
||||
&duckduckgo,
|
||||
@@ -1037,7 +1027,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
+ &googleen, &google, &startpage,
|
||||
&mail_ru,
|
||||
&naver,
|
||||
&parsijoo,
|
||||
&qwant,
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -16,12 +16,12 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
|
||||
// Increment this if you change the data in ways that mean users with
|
||||
// existing data should get a new version. Otherwise, existing data may
|
||||
// continue to be used and updates made here will not always appear.
|
||||
- "kCurrentDataVersion": 112
|
||||
+ "kCurrentDataVersion": 113
|
||||
- "kCurrentDataVersion": 113
|
||||
+ "kCurrentDataVersion": 114
|
||||
},
|
||||
|
||||
// The following engines are included in country lists and are added to the
|
||||
@@ -196,6 +196,7 @@
|
||||
@@ -188,6 +188,7 @@
|
||||
"favicon_url": "https://www.qwant.com/favicon.ico",
|
||||
"search_url": "https://www.qwant.com/?q={searchTerms}&client=opensearch",
|
||||
"suggest_url": "https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch",
|
||||
@@ -440,7 +440,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -396,7 +396,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
|
||||
@@ -396,14 +396,14 @@ const PrepopulatedEngine* const engines_IQ[] = {
|
||||
|
||||
// Iran
|
||||
const PrepopulatedEngine* const engines_IR[] = {
|
||||
@@ -448,8 +448,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
+ &googleen, &google, &startpage, &qwant,
|
||||
&bing,
|
||||
&yahoo,
|
||||
&parsijoo,
|
||||
@@ -404,7 +404,7 @@ const PrepopulatedEngine* const engines_IR[] = {
|
||||
};
|
||||
|
||||
// Iceland
|
||||
const PrepopulatedEngine* const engines_IS[] = {
|
||||
@@ -458,7 +457,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -412,7 +412,7 @@ const PrepopulatedEngine* const engines_IS[] = {
|
||||
@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IS[] = {
|
||||
|
||||
// Italy
|
||||
const PrepopulatedEngine* const engines_IT[] = {
|
||||
@@ -467,7 +466,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -420,7 +420,7 @@ const PrepopulatedEngine* const engines_IT[] = {
|
||||
@@ -419,7 +419,7 @@ const PrepopulatedEngine* const engines_IT[] = {
|
||||
|
||||
// Jamaica
|
||||
const PrepopulatedEngine* const engines_JM[] = {
|
||||
@@ -476,7 +475,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -428,7 +428,7 @@ const PrepopulatedEngine* const engines_JM[] = {
|
||||
@@ -427,7 +427,7 @@ const PrepopulatedEngine* const engines_JM[] = {
|
||||
|
||||
// Jordan
|
||||
const PrepopulatedEngine* const engines_JO[] = {
|
||||
@@ -485,7 +484,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -436,7 +436,7 @@ const PrepopulatedEngine* const engines_JO[] = {
|
||||
@@ -435,7 +435,7 @@ const PrepopulatedEngine* const engines_JO[] = {
|
||||
|
||||
// Japan
|
||||
const PrepopulatedEngine* const engines_JP[] = {
|
||||
@@ -494,7 +493,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_jp,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -444,7 +444,7 @@ const PrepopulatedEngine* const engines_JP[] = {
|
||||
@@ -443,7 +443,7 @@ const PrepopulatedEngine* const engines_JP[] = {
|
||||
|
||||
// Kenya
|
||||
const PrepopulatedEngine* const engines_KE[] = {
|
||||
@@ -503,7 +502,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -452,7 +452,7 @@ const PrepopulatedEngine* const engines_KE[] = {
|
||||
@@ -451,7 +451,7 @@ const PrepopulatedEngine* const engines_KE[] = {
|
||||
|
||||
// South Korea
|
||||
const PrepopulatedEngine* const engines_KR[] = {
|
||||
@@ -512,7 +511,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&naver,
|
||||
&daum,
|
||||
&bing,
|
||||
@@ -460,7 +460,7 @@ const PrepopulatedEngine* const engines_KR[] = {
|
||||
@@ -459,7 +459,7 @@ const PrepopulatedEngine* const engines_KR[] = {
|
||||
|
||||
// Kuwait
|
||||
const PrepopulatedEngine* const engines_KW[] = {
|
||||
@@ -521,7 +520,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&ask,
|
||||
@@ -468,7 +468,7 @@ const PrepopulatedEngine* const engines_KW[] = {
|
||||
@@ -467,7 +467,7 @@ const PrepopulatedEngine* const engines_KW[] = {
|
||||
|
||||
// Kazakhstan
|
||||
const PrepopulatedEngine* const engines_KZ[] = {
|
||||
@@ -530,7 +529,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_kz,
|
||||
&mail_ru,
|
||||
&bing,
|
||||
@@ -476,7 +476,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
|
||||
@@ -475,7 +475,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
|
||||
|
||||
// Lebanon
|
||||
const PrepopulatedEngine* const engines_LB[] = {
|
||||
@@ -539,7 +538,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -484,7 +484,7 @@ const PrepopulatedEngine* const engines_LB[] = {
|
||||
@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_LB[] = {
|
||||
|
||||
// Liechtenstein
|
||||
const PrepopulatedEngine* const engines_LI[] = {
|
||||
@@ -548,7 +547,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
&yahoo,
|
||||
@@ -492,7 +492,7 @@ const PrepopulatedEngine* const engines_LI[] = {
|
||||
@@ -491,7 +491,7 @@ const PrepopulatedEngine* const engines_LI[] = {
|
||||
|
||||
// Lithuania
|
||||
const PrepopulatedEngine* const engines_LT[] = {
|
||||
@@ -557,7 +556,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -500,7 +500,7 @@ const PrepopulatedEngine* const engines_LT[] = {
|
||||
@@ -499,7 +499,7 @@ const PrepopulatedEngine* const engines_LT[] = {
|
||||
|
||||
// Luxembourg
|
||||
const PrepopulatedEngine* const engines_LU[] = {
|
||||
@@ -566,7 +565,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
&yahoo,
|
||||
@@ -508,7 +508,7 @@ const PrepopulatedEngine* const engines_LU[] = {
|
||||
@@ -507,7 +507,7 @@ const PrepopulatedEngine* const engines_LU[] = {
|
||||
|
||||
// Latvia
|
||||
const PrepopulatedEngine* const engines_LV[] = {
|
||||
@@ -575,7 +574,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
&yahoo,
|
||||
@@ -516,7 +516,7 @@ const PrepopulatedEngine* const engines_LV[] = {
|
||||
@@ -515,7 +515,7 @@ const PrepopulatedEngine* const engines_LV[] = {
|
||||
|
||||
// Libya
|
||||
const PrepopulatedEngine* const engines_LY[] = {
|
||||
@@ -584,7 +583,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_com,
|
||||
@@ -524,7 +524,7 @@ const PrepopulatedEngine* const engines_LY[] = {
|
||||
@@ -523,7 +523,7 @@ const PrepopulatedEngine* const engines_LY[] = {
|
||||
|
||||
// Morocco
|
||||
const PrepopulatedEngine* const engines_MA[] = {
|
||||
@@ -593,7 +592,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -532,7 +532,7 @@ const PrepopulatedEngine* const engines_MA[] = {
|
||||
@@ -531,7 +531,7 @@ const PrepopulatedEngine* const engines_MA[] = {
|
||||
|
||||
// Monaco
|
||||
const PrepopulatedEngine* const engines_MC[] = {
|
||||
@@ -602,7 +601,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -540,7 +540,7 @@ const PrepopulatedEngine* const engines_MC[] = {
|
||||
@@ -539,7 +539,7 @@ const PrepopulatedEngine* const engines_MC[] = {
|
||||
|
||||
// Moldova
|
||||
const PrepopulatedEngine* const engines_MD[] = {
|
||||
@@ -611,7 +610,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_ru,
|
||||
&mail_ru,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -548,7 +548,7 @@ const PrepopulatedEngine* const engines_MD[] = {
|
||||
@@ -547,7 +547,7 @@ const PrepopulatedEngine* const engines_MD[] = {
|
||||
|
||||
// Montenegro
|
||||
const PrepopulatedEngine* const engines_ME[] = {
|
||||
@@ -620,7 +619,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -556,7 +556,7 @@ const PrepopulatedEngine* const engines_ME[] = {
|
||||
@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_ME[] = {
|
||||
|
||||
// Macedonia
|
||||
const PrepopulatedEngine* const engines_MK[] = {
|
||||
@@ -629,7 +628,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -564,7 +564,7 @@ const PrepopulatedEngine* const engines_MK[] = {
|
||||
@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_MK[] = {
|
||||
|
||||
// Mexico
|
||||
const PrepopulatedEngine* const engines_MX[] = {
|
||||
@@ -638,7 +637,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_mx,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -572,7 +572,7 @@ const PrepopulatedEngine* const engines_MX[] = {
|
||||
@@ -571,7 +571,7 @@ const PrepopulatedEngine* const engines_MX[] = {
|
||||
|
||||
// Malaysia
|
||||
const PrepopulatedEngine* const engines_MY[] = {
|
||||
@@ -647,7 +646,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_my,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -580,7 +580,7 @@ const PrepopulatedEngine* const engines_MY[] = {
|
||||
@@ -579,7 +579,7 @@ const PrepopulatedEngine* const engines_MY[] = {
|
||||
|
||||
// Nicaragua
|
||||
const PrepopulatedEngine* const engines_NI[] = {
|
||||
@@ -656,7 +655,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -588,7 +588,7 @@ const PrepopulatedEngine* const engines_NI[] = {
|
||||
@@ -587,7 +587,7 @@ const PrepopulatedEngine* const engines_NI[] = {
|
||||
|
||||
// Netherlands
|
||||
const PrepopulatedEngine* const engines_NL[] = {
|
||||
@@ -665,7 +664,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_nl,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -596,7 +596,7 @@ const PrepopulatedEngine* const engines_NL[] = {
|
||||
@@ -595,7 +595,7 @@ const PrepopulatedEngine* const engines_NL[] = {
|
||||
|
||||
// Norway
|
||||
const PrepopulatedEngine* const engines_NO[] = {
|
||||
@@ -674,7 +673,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -604,7 +604,7 @@ const PrepopulatedEngine* const engines_NO[] = {
|
||||
@@ -603,7 +603,7 @@ const PrepopulatedEngine* const engines_NO[] = {
|
||||
|
||||
// New Zealand
|
||||
const PrepopulatedEngine* const engines_NZ[] = {
|
||||
@@ -683,7 +682,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
&yahoo_nz,
|
||||
@@ -612,7 +612,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
|
||||
@@ -611,7 +611,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
|
||||
|
||||
// Oman
|
||||
const PrepopulatedEngine* const engines_OM[] = {
|
||||
@@ -692,7 +691,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&ask,
|
||||
@@ -620,7 +620,7 @@ const PrepopulatedEngine* const engines_OM[] = {
|
||||
@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_OM[] = {
|
||||
|
||||
// Panama
|
||||
const PrepopulatedEngine* const engines_PA[] = {
|
||||
@@ -701,7 +700,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -628,7 +628,7 @@ const PrepopulatedEngine* const engines_PA[] = {
|
||||
@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_PA[] = {
|
||||
|
||||
// Peru
|
||||
const PrepopulatedEngine* const engines_PE[] = {
|
||||
@@ -710,7 +709,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_pe,
|
||||
&bing,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -636,7 +636,7 @@ const PrepopulatedEngine* const engines_PE[] = {
|
||||
@@ -635,7 +635,7 @@ const PrepopulatedEngine* const engines_PE[] = {
|
||||
|
||||
// Philippines
|
||||
const PrepopulatedEngine* const engines_PH[] = {
|
||||
@@ -719,7 +718,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_ph,
|
||||
&bing,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -644,7 +644,7 @@ const PrepopulatedEngine* const engines_PH[] = {
|
||||
@@ -643,7 +643,7 @@ const PrepopulatedEngine* const engines_PH[] = {
|
||||
|
||||
// Pakistan
|
||||
const PrepopulatedEngine* const engines_PK[] = {
|
||||
@@ -728,7 +727,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -652,7 +652,7 @@ const PrepopulatedEngine* const engines_PK[] = {
|
||||
@@ -651,7 +651,7 @@ const PrepopulatedEngine* const engines_PK[] = {
|
||||
|
||||
// Poland
|
||||
const PrepopulatedEngine* const engines_PL[] = {
|
||||
@@ -737,7 +736,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -660,7 +660,7 @@ const PrepopulatedEngine* const engines_PL[] = {
|
||||
@@ -659,7 +659,7 @@ const PrepopulatedEngine* const engines_PL[] = {
|
||||
|
||||
// Puerto Rico
|
||||
const PrepopulatedEngine* const engines_PR[] = {
|
||||
@@ -746,7 +745,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -668,7 +668,7 @@ const PrepopulatedEngine* const engines_PR[] = {
|
||||
@@ -667,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = {
|
||||
|
||||
// Portugal
|
||||
const PrepopulatedEngine* const engines_PT[] = {
|
||||
@@ -755,7 +754,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -676,7 +676,7 @@ const PrepopulatedEngine* const engines_PT[] = {
|
||||
@@ -675,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = {
|
||||
|
||||
// Paraguay
|
||||
const PrepopulatedEngine* const engines_PY[] = {
|
||||
@@ -764,7 +763,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -684,7 +684,7 @@ const PrepopulatedEngine* const engines_PY[] = {
|
||||
@@ -683,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = {
|
||||
|
||||
// Qatar
|
||||
const PrepopulatedEngine* const engines_QA[] = {
|
||||
@@ -773,7 +772,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&ask,
|
||||
@@ -692,7 +692,7 @@ const PrepopulatedEngine* const engines_QA[] = {
|
||||
@@ -691,7 +691,7 @@ const PrepopulatedEngine* const engines_QA[] = {
|
||||
|
||||
// Romania
|
||||
const PrepopulatedEngine* const engines_RO[] = {
|
||||
@@ -782,7 +781,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -700,7 +700,7 @@ const PrepopulatedEngine* const engines_RO[] = {
|
||||
@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = {
|
||||
|
||||
// Serbia
|
||||
const PrepopulatedEngine* const engines_RS[] = {
|
||||
@@ -791,7 +790,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -709,14 +709,14 @@ const PrepopulatedEngine* const engines_RS[] = {
|
||||
@@ -708,14 +708,14 @@ const PrepopulatedEngine* const engines_RS[] = {
|
||||
// Russia
|
||||
const PrepopulatedEngine* const engines_RU[] = {
|
||||
&yandex_ru,
|
||||
@@ -808,7 +807,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -724,7 +724,7 @@ const PrepopulatedEngine* const engines_RW[] = {
|
||||
@@ -723,7 +723,7 @@ const PrepopulatedEngine* const engines_RW[] = {
|
||||
|
||||
// Saudi Arabia
|
||||
const PrepopulatedEngine* const engines_SA[] = {
|
||||
@@ -817,7 +816,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_com,
|
||||
@@ -732,7 +732,7 @@ const PrepopulatedEngine* const engines_SA[] = {
|
||||
@@ -731,7 +731,7 @@ const PrepopulatedEngine* const engines_SA[] = {
|
||||
|
||||
// Sweden
|
||||
const PrepopulatedEngine* const engines_SE[] = {
|
||||
@@ -826,7 +825,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_se,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -740,7 +740,7 @@ const PrepopulatedEngine* const engines_SE[] = {
|
||||
@@ -739,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = {
|
||||
|
||||
// Singapore
|
||||
const PrepopulatedEngine* const engines_SG[] = {
|
||||
@@ -835,7 +834,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_sg,
|
||||
&yandex_com,
|
||||
@@ -748,7 +748,7 @@ const PrepopulatedEngine* const engines_SG[] = {
|
||||
@@ -747,7 +747,7 @@ const PrepopulatedEngine* const engines_SG[] = {
|
||||
|
||||
// Slovenia
|
||||
const PrepopulatedEngine* const engines_SI[] = {
|
||||
@@ -844,7 +843,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -756,7 +756,7 @@ const PrepopulatedEngine* const engines_SI[] = {
|
||||
@@ -755,7 +755,7 @@ const PrepopulatedEngine* const engines_SI[] = {
|
||||
|
||||
// Slovakia
|
||||
const PrepopulatedEngine* const engines_SK[] = {
|
||||
@@ -853,7 +852,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -764,7 +764,7 @@ const PrepopulatedEngine* const engines_SK[] = {
|
||||
@@ -763,7 +763,7 @@ const PrepopulatedEngine* const engines_SK[] = {
|
||||
|
||||
// El Salvador
|
||||
const PrepopulatedEngine* const engines_SV[] = {
|
||||
@@ -862,7 +861,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -772,7 +772,7 @@ const PrepopulatedEngine* const engines_SV[] = {
|
||||
@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = {
|
||||
|
||||
// Syria
|
||||
const PrepopulatedEngine* const engines_SY[] = {
|
||||
@@ -871,7 +870,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -780,7 +780,7 @@ const PrepopulatedEngine* const engines_SY[] = {
|
||||
@@ -779,7 +779,7 @@ const PrepopulatedEngine* const engines_SY[] = {
|
||||
|
||||
// Thailand
|
||||
const PrepopulatedEngine* const engines_TH[] = {
|
||||
@@ -880,7 +879,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_th,
|
||||
&bing,
|
||||
&ask,
|
||||
@@ -788,7 +788,7 @@ const PrepopulatedEngine* const engines_TH[] = {
|
||||
@@ -787,7 +787,7 @@ const PrepopulatedEngine* const engines_TH[] = {
|
||||
|
||||
// Tunisia
|
||||
const PrepopulatedEngine* const engines_TN[] = {
|
||||
@@ -889,7 +888,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -796,7 +796,7 @@ const PrepopulatedEngine* const engines_TN[] = {
|
||||
@@ -795,7 +795,7 @@ const PrepopulatedEngine* const engines_TN[] = {
|
||||
|
||||
// Turkey
|
||||
const PrepopulatedEngine* const engines_TR[] = {
|
||||
@@ -898,7 +897,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_tr,
|
||||
&yahoo_tr,
|
||||
&bing,
|
||||
@@ -804,7 +804,7 @@ const PrepopulatedEngine* const engines_TR[] = {
|
||||
@@ -803,7 +803,7 @@ const PrepopulatedEngine* const engines_TR[] = {
|
||||
|
||||
// Trinidad and Tobago
|
||||
const PrepopulatedEngine* const engines_TT[] = {
|
||||
@@ -907,7 +906,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -812,7 +812,7 @@ const PrepopulatedEngine* const engines_TT[] = {
|
||||
@@ -811,7 +811,7 @@ const PrepopulatedEngine* const engines_TT[] = {
|
||||
|
||||
// Taiwan
|
||||
const PrepopulatedEngine* const engines_TW[] = {
|
||||
@@ -916,7 +915,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_tw,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -820,7 +820,7 @@ const PrepopulatedEngine* const engines_TW[] = {
|
||||
@@ -819,7 +819,7 @@ const PrepopulatedEngine* const engines_TW[] = {
|
||||
|
||||
// Tanzania
|
||||
const PrepopulatedEngine* const engines_TZ[] = {
|
||||
@@ -925,7 +924,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -828,7 +828,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
|
||||
@@ -827,7 +827,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
|
||||
|
||||
// Ukraine
|
||||
const PrepopulatedEngine* const engines_UA[] = {
|
||||
@@ -934,7 +933,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_ua,
|
||||
&mail_ru,
|
||||
&bing,
|
||||
@@ -836,7 +836,7 @@ const PrepopulatedEngine* const engines_UA[] = {
|
||||
@@ -835,7 +835,7 @@ const PrepopulatedEngine* const engines_UA[] = {
|
||||
|
||||
// United States
|
||||
const PrepopulatedEngine* const engines_US[] = {
|
||||
@@ -943,7 +942,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -844,7 +844,7 @@ const PrepopulatedEngine* const engines_US[] = {
|
||||
@@ -843,7 +843,7 @@ const PrepopulatedEngine* const engines_US[] = {
|
||||
|
||||
// Uruguay
|
||||
const PrepopulatedEngine* const engines_UY[] = {
|
||||
@@ -952,7 +951,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -852,7 +852,7 @@ const PrepopulatedEngine* const engines_UY[] = {
|
||||
@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_UY[] = {
|
||||
|
||||
// Venezuela
|
||||
const PrepopulatedEngine* const engines_VE[] = {
|
||||
@@ -961,7 +960,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_ve,
|
||||
&bing,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -860,7 +860,7 @@ const PrepopulatedEngine* const engines_VE[] = {
|
||||
@@ -859,7 +859,7 @@ const PrepopulatedEngine* const engines_VE[] = {
|
||||
|
||||
// Vietnam
|
||||
const PrepopulatedEngine* const engines_VN[] = {
|
||||
@@ -970,7 +969,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&coccoc,
|
||||
&bing,
|
||||
&yahoo_vn,
|
||||
@@ -868,7 +868,7 @@ const PrepopulatedEngine* const engines_VN[] = {
|
||||
@@ -867,7 +867,7 @@ const PrepopulatedEngine* const engines_VN[] = {
|
||||
|
||||
// Yemen
|
||||
const PrepopulatedEngine* const engines_YE[] = {
|
||||
@@ -979,7 +978,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&baidu,
|
||||
@@ -876,7 +876,7 @@ const PrepopulatedEngine* const engines_YE[] = {
|
||||
@@ -875,7 +875,7 @@ const PrepopulatedEngine* const engines_YE[] = {
|
||||
|
||||
// South Africa
|
||||
const PrepopulatedEngine* const engines_ZA[] = {
|
||||
@@ -988,7 +987,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -884,7 +884,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
|
||||
@@ -883,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
|
||||
|
||||
// Zimbabwe
|
||||
const PrepopulatedEngine* const engines_ZW[] = {
|
||||
@@ -997,7 +996,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&baidu,
|
||||
@@ -900,7 +900,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
|
||||
@@ -899,7 +899,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
|
||||
&coccoc,
|
||||
&daum,
|
||||
&duckduckgo, &duckduckgo_light,
|
||||
@@ -1005,7 +1004,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
+ &googleen, &google, &startpage, &qwant,
|
||||
&mail_ru,
|
||||
&naver,
|
||||
&parsijoo,
|
||||
&qwant,
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -3,24 +3,15 @@ Date: Wed, 18 Oct 2017 21:24:05 +0200
|
||||
Subject: Add StartPage search engine
|
||||
|
||||
---
|
||||
.../search_engines/prepopulated_engines.json | 12 +-
|
||||
.../search_engines/prepopulated_engines.json | 10 +
|
||||
components/search_engines/search_engine_type.h | 1 +
|
||||
.../template_url_prepopulate_data.cc | 218 ++++++++++-----------
|
||||
3 files changed, 121 insertions(+), 110 deletions(-)
|
||||
3 files changed, 120 insertions(+), 109 deletions(-)
|
||||
|
||||
diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
|
||||
--- a/components/search_engines/prepopulated_engines.json
|
||||
+++ b/components/search_engines/prepopulated_engines.json
|
||||
@@ -28,7 +28,7 @@
|
||||
// Increment this if you change the data in ways that mean users with
|
||||
// existing data should get a new version. Otherwise, existing data may
|
||||
// continue to be used and updates made here will not always appear.
|
||||
- "kCurrentDataVersion": 110
|
||||
+ "kCurrentDataVersion": 111
|
||||
},
|
||||
|
||||
// The following engines are included in country lists and are added to the
|
||||
@@ -206,6 +206,16 @@
|
||||
@@ -198,6 +198,16 @@
|
||||
"id": 56
|
||||
},
|
||||
|
||||
@@ -459,7 +450,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -395,7 +395,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
|
||||
@@ -395,14 +395,14 @@ const PrepopulatedEngine* const engines_IQ[] = {
|
||||
|
||||
// Iran
|
||||
const PrepopulatedEngine* const engines_IR[] = {
|
||||
@@ -467,8 +458,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
+ &google, &startpage,
|
||||
&bing,
|
||||
&yahoo,
|
||||
&parsijoo,
|
||||
@@ -403,7 +403,7 @@ const PrepopulatedEngine* const engines_IR[] = {
|
||||
};
|
||||
|
||||
// Iceland
|
||||
const PrepopulatedEngine* const engines_IS[] = {
|
||||
@@ -477,7 +467,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IS[] = {
|
||||
@@ -410,7 +410,7 @@ const PrepopulatedEngine* const engines_IS[] = {
|
||||
|
||||
// Italy
|
||||
const PrepopulatedEngine* const engines_IT[] = {
|
||||
@@ -486,7 +476,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -419,7 +419,7 @@ const PrepopulatedEngine* const engines_IT[] = {
|
||||
@@ -418,7 +418,7 @@ const PrepopulatedEngine* const engines_IT[] = {
|
||||
|
||||
// Jamaica
|
||||
const PrepopulatedEngine* const engines_JM[] = {
|
||||
@@ -495,7 +485,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -427,7 +427,7 @@ const PrepopulatedEngine* const engines_JM[] = {
|
||||
@@ -426,7 +426,7 @@ const PrepopulatedEngine* const engines_JM[] = {
|
||||
|
||||
// Jordan
|
||||
const PrepopulatedEngine* const engines_JO[] = {
|
||||
@@ -504,7 +494,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -435,7 +435,7 @@ const PrepopulatedEngine* const engines_JO[] = {
|
||||
@@ -434,7 +434,7 @@ const PrepopulatedEngine* const engines_JO[] = {
|
||||
|
||||
// Japan
|
||||
const PrepopulatedEngine* const engines_JP[] = {
|
||||
@@ -513,7 +503,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_jp,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -443,7 +443,7 @@ const PrepopulatedEngine* const engines_JP[] = {
|
||||
@@ -442,7 +442,7 @@ const PrepopulatedEngine* const engines_JP[] = {
|
||||
|
||||
// Kenya
|
||||
const PrepopulatedEngine* const engines_KE[] = {
|
||||
@@ -522,7 +512,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -451,7 +451,7 @@ const PrepopulatedEngine* const engines_KE[] = {
|
||||
@@ -450,7 +450,7 @@ const PrepopulatedEngine* const engines_KE[] = {
|
||||
|
||||
// South Korea
|
||||
const PrepopulatedEngine* const engines_KR[] = {
|
||||
@@ -531,7 +521,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&naver,
|
||||
&daum,
|
||||
&bing,
|
||||
@@ -459,7 +459,7 @@ const PrepopulatedEngine* const engines_KR[] = {
|
||||
@@ -458,7 +458,7 @@ const PrepopulatedEngine* const engines_KR[] = {
|
||||
|
||||
// Kuwait
|
||||
const PrepopulatedEngine* const engines_KW[] = {
|
||||
@@ -540,7 +530,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&ask,
|
||||
@@ -467,7 +467,7 @@ const PrepopulatedEngine* const engines_KW[] = {
|
||||
@@ -466,7 +466,7 @@ const PrepopulatedEngine* const engines_KW[] = {
|
||||
|
||||
// Kazakhstan
|
||||
const PrepopulatedEngine* const engines_KZ[] = {
|
||||
@@ -549,7 +539,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_kz,
|
||||
&mail_ru,
|
||||
&bing,
|
||||
@@ -475,7 +475,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
|
||||
@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
|
||||
|
||||
// Lebanon
|
||||
const PrepopulatedEngine* const engines_LB[] = {
|
||||
@@ -558,7 +548,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_LB[] = {
|
||||
@@ -482,7 +482,7 @@ const PrepopulatedEngine* const engines_LB[] = {
|
||||
|
||||
// Liechtenstein
|
||||
const PrepopulatedEngine* const engines_LI[] = {
|
||||
@@ -567,7 +557,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
&yahoo,
|
||||
@@ -491,7 +491,7 @@ const PrepopulatedEngine* const engines_LI[] = {
|
||||
@@ -490,7 +490,7 @@ const PrepopulatedEngine* const engines_LI[] = {
|
||||
|
||||
// Lithuania
|
||||
const PrepopulatedEngine* const engines_LT[] = {
|
||||
@@ -576,7 +566,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -499,7 +499,7 @@ const PrepopulatedEngine* const engines_LT[] = {
|
||||
@@ -498,7 +498,7 @@ const PrepopulatedEngine* const engines_LT[] = {
|
||||
|
||||
// Luxembourg
|
||||
const PrepopulatedEngine* const engines_LU[] = {
|
||||
@@ -585,7 +575,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
&yahoo,
|
||||
@@ -507,7 +507,7 @@ const PrepopulatedEngine* const engines_LU[] = {
|
||||
@@ -506,7 +506,7 @@ const PrepopulatedEngine* const engines_LU[] = {
|
||||
|
||||
// Latvia
|
||||
const PrepopulatedEngine* const engines_LV[] = {
|
||||
@@ -594,7 +584,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
&yahoo,
|
||||
@@ -515,7 +515,7 @@ const PrepopulatedEngine* const engines_LV[] = {
|
||||
@@ -514,7 +514,7 @@ const PrepopulatedEngine* const engines_LV[] = {
|
||||
|
||||
// Libya
|
||||
const PrepopulatedEngine* const engines_LY[] = {
|
||||
@@ -603,7 +593,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_com,
|
||||
@@ -523,7 +523,7 @@ const PrepopulatedEngine* const engines_LY[] = {
|
||||
@@ -522,7 +522,7 @@ const PrepopulatedEngine* const engines_LY[] = {
|
||||
|
||||
// Morocco
|
||||
const PrepopulatedEngine* const engines_MA[] = {
|
||||
@@ -612,7 +602,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -531,7 +531,7 @@ const PrepopulatedEngine* const engines_MA[] = {
|
||||
@@ -530,7 +530,7 @@ const PrepopulatedEngine* const engines_MA[] = {
|
||||
|
||||
// Monaco
|
||||
const PrepopulatedEngine* const engines_MC[] = {
|
||||
@@ -621,7 +611,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -539,7 +539,7 @@ const PrepopulatedEngine* const engines_MC[] = {
|
||||
@@ -538,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = {
|
||||
|
||||
// Moldova
|
||||
const PrepopulatedEngine* const engines_MD[] = {
|
||||
@@ -630,7 +620,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_ru,
|
||||
&mail_ru,
|
||||
&duckduckgo,
|
||||
@@ -547,7 +547,7 @@ const PrepopulatedEngine* const engines_MD[] = {
|
||||
@@ -546,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = {
|
||||
|
||||
// Montenegro
|
||||
const PrepopulatedEngine* const engines_ME[] = {
|
||||
@@ -639,7 +629,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_ME[] = {
|
||||
@@ -554,7 +554,7 @@ const PrepopulatedEngine* const engines_ME[] = {
|
||||
|
||||
// Macedonia
|
||||
const PrepopulatedEngine* const engines_MK[] = {
|
||||
@@ -648,7 +638,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_MK[] = {
|
||||
@@ -562,7 +562,7 @@ const PrepopulatedEngine* const engines_MK[] = {
|
||||
|
||||
// Mexico
|
||||
const PrepopulatedEngine* const engines_MX[] = {
|
||||
@@ -657,7 +647,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_mx,
|
||||
&duckduckgo,
|
||||
@@ -571,7 +571,7 @@ const PrepopulatedEngine* const engines_MX[] = {
|
||||
@@ -570,7 +570,7 @@ const PrepopulatedEngine* const engines_MX[] = {
|
||||
|
||||
// Malaysia
|
||||
const PrepopulatedEngine* const engines_MY[] = {
|
||||
@@ -666,7 +656,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_my,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -579,7 +579,7 @@ const PrepopulatedEngine* const engines_MY[] = {
|
||||
@@ -578,7 +578,7 @@ const PrepopulatedEngine* const engines_MY[] = {
|
||||
|
||||
// Nicaragua
|
||||
const PrepopulatedEngine* const engines_NI[] = {
|
||||
@@ -675,7 +665,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -587,7 +587,7 @@ const PrepopulatedEngine* const engines_NI[] = {
|
||||
@@ -586,7 +586,7 @@ const PrepopulatedEngine* const engines_NI[] = {
|
||||
|
||||
// Netherlands
|
||||
const PrepopulatedEngine* const engines_NL[] = {
|
||||
@@ -684,7 +674,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_nl,
|
||||
&duckduckgo,
|
||||
@@ -595,7 +595,7 @@ const PrepopulatedEngine* const engines_NL[] = {
|
||||
@@ -594,7 +594,7 @@ const PrepopulatedEngine* const engines_NL[] = {
|
||||
|
||||
// Norway
|
||||
const PrepopulatedEngine* const engines_NO[] = {
|
||||
@@ -693,7 +683,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -603,7 +603,7 @@ const PrepopulatedEngine* const engines_NO[] = {
|
||||
@@ -602,7 +602,7 @@ const PrepopulatedEngine* const engines_NO[] = {
|
||||
|
||||
// New Zealand
|
||||
const PrepopulatedEngine* const engines_NZ[] = {
|
||||
@@ -702,7 +692,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
&yahoo_nz,
|
||||
@@ -611,7 +611,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
|
||||
@@ -610,7 +610,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
|
||||
|
||||
// Oman
|
||||
const PrepopulatedEngine* const engines_OM[] = {
|
||||
@@ -711,7 +701,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&ask,
|
||||
@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_OM[] = {
|
||||
@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_OM[] = {
|
||||
|
||||
// Panama
|
||||
const PrepopulatedEngine* const engines_PA[] = {
|
||||
@@ -720,7 +710,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_PA[] = {
|
||||
@@ -626,7 +626,7 @@ const PrepopulatedEngine* const engines_PA[] = {
|
||||
|
||||
// Peru
|
||||
const PrepopulatedEngine* const engines_PE[] = {
|
||||
@@ -729,7 +719,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_pe,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -635,7 +635,7 @@ const PrepopulatedEngine* const engines_PE[] = {
|
||||
@@ -634,7 +634,7 @@ const PrepopulatedEngine* const engines_PE[] = {
|
||||
|
||||
// Philippines
|
||||
const PrepopulatedEngine* const engines_PH[] = {
|
||||
@@ -738,7 +728,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_ph,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -643,7 +643,7 @@ const PrepopulatedEngine* const engines_PH[] = {
|
||||
@@ -642,7 +642,7 @@ const PrepopulatedEngine* const engines_PH[] = {
|
||||
|
||||
// Pakistan
|
||||
const PrepopulatedEngine* const engines_PK[] = {
|
||||
@@ -747,7 +737,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -651,7 +651,7 @@ const PrepopulatedEngine* const engines_PK[] = {
|
||||
@@ -650,7 +650,7 @@ const PrepopulatedEngine* const engines_PK[] = {
|
||||
|
||||
// Poland
|
||||
const PrepopulatedEngine* const engines_PL[] = {
|
||||
@@ -756,7 +746,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -659,7 +659,7 @@ const PrepopulatedEngine* const engines_PL[] = {
|
||||
@@ -658,7 +658,7 @@ const PrepopulatedEngine* const engines_PL[] = {
|
||||
|
||||
// Puerto Rico
|
||||
const PrepopulatedEngine* const engines_PR[] = {
|
||||
@@ -765,7 +755,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -667,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = {
|
||||
@@ -666,7 +666,7 @@ const PrepopulatedEngine* const engines_PR[] = {
|
||||
|
||||
// Portugal
|
||||
const PrepopulatedEngine* const engines_PT[] = {
|
||||
@@ -774,7 +764,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -675,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = {
|
||||
@@ -674,7 +674,7 @@ const PrepopulatedEngine* const engines_PT[] = {
|
||||
|
||||
// Paraguay
|
||||
const PrepopulatedEngine* const engines_PY[] = {
|
||||
@@ -783,7 +773,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -683,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = {
|
||||
@@ -682,7 +682,7 @@ const PrepopulatedEngine* const engines_PY[] = {
|
||||
|
||||
// Qatar
|
||||
const PrepopulatedEngine* const engines_QA[] = {
|
||||
@@ -792,7 +782,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&ask,
|
||||
@@ -691,7 +691,7 @@ const PrepopulatedEngine* const engines_QA[] = {
|
||||
@@ -690,7 +690,7 @@ const PrepopulatedEngine* const engines_QA[] = {
|
||||
|
||||
// Romania
|
||||
const PrepopulatedEngine* const engines_RO[] = {
|
||||
@@ -801,7 +791,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = {
|
||||
@@ -698,7 +698,7 @@ const PrepopulatedEngine* const engines_RO[] = {
|
||||
|
||||
// Serbia
|
||||
const PrepopulatedEngine* const engines_RS[] = {
|
||||
@@ -810,7 +800,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -708,14 +708,14 @@ const PrepopulatedEngine* const engines_RS[] = {
|
||||
@@ -707,14 +707,14 @@ const PrepopulatedEngine* const engines_RS[] = {
|
||||
// Russia
|
||||
const PrepopulatedEngine* const engines_RU[] = {
|
||||
&yandex_ru,
|
||||
@@ -827,7 +817,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -723,7 +723,7 @@ const PrepopulatedEngine* const engines_RW[] = {
|
||||
@@ -722,7 +722,7 @@ const PrepopulatedEngine* const engines_RW[] = {
|
||||
|
||||
// Saudi Arabia
|
||||
const PrepopulatedEngine* const engines_SA[] = {
|
||||
@@ -836,7 +826,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_com,
|
||||
@@ -731,7 +731,7 @@ const PrepopulatedEngine* const engines_SA[] = {
|
||||
@@ -730,7 +730,7 @@ const PrepopulatedEngine* const engines_SA[] = {
|
||||
|
||||
// Sweden
|
||||
const PrepopulatedEngine* const engines_SE[] = {
|
||||
@@ -845,7 +835,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_se,
|
||||
&duckduckgo,
|
||||
@@ -739,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = {
|
||||
@@ -738,7 +738,7 @@ const PrepopulatedEngine* const engines_SE[] = {
|
||||
|
||||
// Singapore
|
||||
const PrepopulatedEngine* const engines_SG[] = {
|
||||
@@ -854,7 +844,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo_sg,
|
||||
&yandex_com,
|
||||
@@ -747,7 +747,7 @@ const PrepopulatedEngine* const engines_SG[] = {
|
||||
@@ -746,7 +746,7 @@ const PrepopulatedEngine* const engines_SG[] = {
|
||||
|
||||
// Slovenia
|
||||
const PrepopulatedEngine* const engines_SI[] = {
|
||||
@@ -863,7 +853,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -755,7 +755,7 @@ const PrepopulatedEngine* const engines_SI[] = {
|
||||
@@ -754,7 +754,7 @@ const PrepopulatedEngine* const engines_SI[] = {
|
||||
|
||||
// Slovakia
|
||||
const PrepopulatedEngine* const engines_SK[] = {
|
||||
@@ -872,7 +862,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -763,7 +763,7 @@ const PrepopulatedEngine* const engines_SK[] = {
|
||||
@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_SK[] = {
|
||||
|
||||
// El Salvador
|
||||
const PrepopulatedEngine* const engines_SV[] = {
|
||||
@@ -881,7 +871,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = {
|
||||
@@ -770,7 +770,7 @@ const PrepopulatedEngine* const engines_SV[] = {
|
||||
|
||||
// Syria
|
||||
const PrepopulatedEngine* const engines_SY[] = {
|
||||
@@ -890,7 +880,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -779,7 +779,7 @@ const PrepopulatedEngine* const engines_SY[] = {
|
||||
@@ -778,7 +778,7 @@ const PrepopulatedEngine* const engines_SY[] = {
|
||||
|
||||
// Thailand
|
||||
const PrepopulatedEngine* const engines_TH[] = {
|
||||
@@ -899,7 +889,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_th,
|
||||
&bing,
|
||||
&ask,
|
||||
@@ -787,7 +787,7 @@ const PrepopulatedEngine* const engines_TH[] = {
|
||||
@@ -786,7 +786,7 @@ const PrepopulatedEngine* const engines_TH[] = {
|
||||
|
||||
// Tunisia
|
||||
const PrepopulatedEngine* const engines_TN[] = {
|
||||
@@ -908,7 +898,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo,
|
||||
&bing,
|
||||
&yandex_ru,
|
||||
@@ -795,7 +795,7 @@ const PrepopulatedEngine* const engines_TN[] = {
|
||||
@@ -794,7 +794,7 @@ const PrepopulatedEngine* const engines_TN[] = {
|
||||
|
||||
// Turkey
|
||||
const PrepopulatedEngine* const engines_TR[] = {
|
||||
@@ -917,7 +907,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_tr,
|
||||
&yahoo_tr,
|
||||
&bing,
|
||||
@@ -803,7 +803,7 @@ const PrepopulatedEngine* const engines_TR[] = {
|
||||
@@ -802,7 +802,7 @@ const PrepopulatedEngine* const engines_TR[] = {
|
||||
|
||||
// Trinidad and Tobago
|
||||
const PrepopulatedEngine* const engines_TT[] = {
|
||||
@@ -926,7 +916,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -811,7 +811,7 @@ const PrepopulatedEngine* const engines_TT[] = {
|
||||
@@ -810,7 +810,7 @@ const PrepopulatedEngine* const engines_TT[] = {
|
||||
|
||||
// Taiwan
|
||||
const PrepopulatedEngine* const engines_TW[] = {
|
||||
@@ -935,7 +925,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_tw,
|
||||
&bing,
|
||||
&baidu,
|
||||
@@ -819,7 +819,7 @@ const PrepopulatedEngine* const engines_TW[] = {
|
||||
@@ -818,7 +818,7 @@ const PrepopulatedEngine* const engines_TW[] = {
|
||||
|
||||
// Tanzania
|
||||
const PrepopulatedEngine* const engines_TZ[] = {
|
||||
@@ -944,7 +934,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&yandex_ru,
|
||||
@@ -827,7 +827,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
|
||||
@@ -826,7 +826,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
|
||||
|
||||
// Ukraine
|
||||
const PrepopulatedEngine* const engines_UA[] = {
|
||||
@@ -953,7 +943,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yandex_ua,
|
||||
&mail_ru,
|
||||
&bing,
|
||||
@@ -835,7 +835,7 @@ const PrepopulatedEngine* const engines_UA[] = {
|
||||
@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_UA[] = {
|
||||
|
||||
// United States
|
||||
const PrepopulatedEngine* const engines_US[] = {
|
||||
@@ -962,7 +952,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -843,7 +843,7 @@ const PrepopulatedEngine* const engines_US[] = {
|
||||
@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_US[] = {
|
||||
|
||||
// Uruguay
|
||||
const PrepopulatedEngine* const engines_UY[] = {
|
||||
@@ -971,7 +961,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_UY[] = {
|
||||
@@ -850,7 +850,7 @@ const PrepopulatedEngine* const engines_UY[] = {
|
||||
|
||||
// Venezuela
|
||||
const PrepopulatedEngine* const engines_VE[] = {
|
||||
@@ -980,7 +970,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&yahoo_ve,
|
||||
&bing,
|
||||
&duckduckgo,
|
||||
@@ -859,7 +859,7 @@ const PrepopulatedEngine* const engines_VE[] = {
|
||||
@@ -858,7 +858,7 @@ const PrepopulatedEngine* const engines_VE[] = {
|
||||
|
||||
// Vietnam
|
||||
const PrepopulatedEngine* const engines_VN[] = {
|
||||
@@ -989,7 +979,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&coccoc,
|
||||
&bing,
|
||||
&yahoo_vn,
|
||||
@@ -867,7 +867,7 @@ const PrepopulatedEngine* const engines_VN[] = {
|
||||
@@ -866,7 +866,7 @@ const PrepopulatedEngine* const engines_VN[] = {
|
||||
|
||||
// Yemen
|
||||
const PrepopulatedEngine* const engines_YE[] = {
|
||||
@@ -998,7 +988,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&baidu,
|
||||
@@ -875,7 +875,7 @@ const PrepopulatedEngine* const engines_YE[] = {
|
||||
@@ -874,7 +874,7 @@ const PrepopulatedEngine* const engines_YE[] = {
|
||||
|
||||
// South Africa
|
||||
const PrepopulatedEngine* const engines_ZA[] = {
|
||||
@@ -1007,7 +997,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&duckduckgo,
|
||||
@@ -883,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
|
||||
@@ -882,7 +882,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
|
||||
|
||||
// Zimbabwe
|
||||
const PrepopulatedEngine* const engines_ZW[] = {
|
||||
@@ -1016,7 +1006,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
&bing,
|
||||
&yahoo,
|
||||
&baidu,
|
||||
@@ -899,7 +899,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
|
||||
@@ -898,7 +898,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
|
||||
&coccoc,
|
||||
&daum,
|
||||
&duckduckgo,
|
||||
@@ -1024,7 +1014,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
|
||||
+ &google, &startpage,
|
||||
&mail_ru,
|
||||
&naver,
|
||||
&parsijoo,
|
||||
&qwant,
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ Do not fallback to UDP when using DoH
|
||||
|
||||
See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-14.txt
|
||||
---
|
||||
chrome/browser/about_flags.cc | 14 +++++++++++
|
||||
chrome/browser/about_flags.cc | 11 +++++++++
|
||||
chrome/browser/flag_descriptions.cc | 3 +++
|
||||
chrome/browser/flag_descriptions.h | 3 +++
|
||||
.../browser/net/system_network_context_manager.cc | 17 +++++++------
|
||||
@@ -18,14 +18,14 @@ See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-14.txt
|
||||
.../common/network_features.h | 5 +++-
|
||||
.../common/network_switch_list.h | 4 ++++
|
||||
net/base/load_flags_list.h | 6 +++++
|
||||
net/dns/dns_transaction.cc | 28 +++-------------------
|
||||
net/dns/dns_transaction.cc | 27 +++------------------
|
||||
net/url_request/url_request_http_job.cc | 28 +++++++++++++---------
|
||||
10 files changed, 67 insertions(+), 48 deletions(-)
|
||||
10 files changed, 64 insertions(+), 47 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -423,6 +423,14 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = {
|
||||
@@ -403,6 +403,14 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = {
|
||||
base::size(kCCTModuleCache_ThirtyMinutes), nullptr},
|
||||
};
|
||||
|
||||
@@ -39,24 +39,21 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
+
|
||||
#endif // OS_ANDROID
|
||||
|
||||
const FeatureEntry::Choice kMHTMLGeneratorOptionChoices[] = {
|
||||
@@ -3433,6 +3441,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kAsyncDns)},
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
+#if defined(OS_ANDROID)
|
||||
const FeatureEntry::Choice kEnableGpuRasterizationChoices[] = {
|
||||
@@ -3456,6 +3464,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kEnableSyncUSSBookmarksName,
|
||||
flag_descriptions::kEnableSyncUSSBookmarksDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(switches::kSyncUSSBookmarks)},
|
||||
+ {"enable-dns-over-https", flag_descriptions::kDnsOverHttpsName,
|
||||
+ flag_descriptions::kDnsOverHttpsDescription, kOsAndroid,
|
||||
+ MULTI_VALUE_TYPE(kDnsOverHttpsChoices)},
|
||||
+#endif // defined(OS_ANDROID)
|
||||
+
|
||||
{"enable-overflow-icons-for-media-controls",
|
||||
flag_descriptions::kOverflowIconsForMediaControlsName,
|
||||
flag_descriptions::kOverflowIconsForMediaControlsDescription, kOsAll,
|
||||
|
||||
#if defined(OS_ANDROID)
|
||||
{"incognito-strings", flag_descriptions::kIncognitoStringsName,
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -2292,6 +2292,9 @@ const char kAutoFetchOnNetErrorPageDescription[] =
|
||||
@@ -2199,6 +2199,9 @@ const char kAutoFetchOnNetErrorPageDescription[] =
|
||||
"When enabled, and navigation fails with an offline error, schedule a "
|
||||
"fetch of the page when online again.";
|
||||
|
||||
@@ -69,7 +66,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -1362,6 +1362,9 @@ extern const char kAsyncDnsDescription[];
|
||||
@@ -1319,6 +1319,9 @@ extern const char kAsyncDnsDescription[];
|
||||
extern const char kAutoFetchOnNetErrorPageName[];
|
||||
extern const char kAutoFetchOnNetErrorPageDescription[];
|
||||
|
||||
@@ -82,7 +79,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
|
||||
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
|
||||
--- a/chrome/browser/net/system_network_context_manager.cc
|
||||
+++ b/chrome/browser/net/system_network_context_manager.cc
|
||||
@@ -24,6 +24,7 @@
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "chrome/browser/component_updater/sth_set_component_installer.h"
|
||||
#include "chrome/browser/io_thread.h"
|
||||
#include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
|
||||
@@ -90,7 +87,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
|
||||
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
||||
#include "chrome/browser/ssl/ssl_config_service_manager.h"
|
||||
#include "chrome/common/channel_info.h"
|
||||
@@ -121,6 +122,7 @@ void GetStubResolverConfig(
|
||||
@@ -124,6 +125,7 @@ void GetStubResolverConfig(
|
||||
if (!net::dns_util::IsValidDoHTemplate(
|
||||
doh_server_list[i].GetString(),
|
||||
doh_server_method_list[i].GetString())) {
|
||||
@@ -98,7 +95,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -395,15 +397,12 @@ SystemNetworkContextManager::SystemNetworkContextManager(
|
||||
@@ -399,15 +401,12 @@ SystemNetworkContextManager::SystemNetworkContextManager(
|
||||
base::Value(ShouldEnableAsyncDns()));
|
||||
base::ListValue default_doh_servers;
|
||||
base::ListValue default_doh_server_methods;
|
||||
@@ -183,11 +180,10 @@ diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
|
||||
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
|
||||
--- a/net/dns/dns_transaction.cc
|
||||
+++ b/net/dns/dns_transaction.cc
|
||||
@@ -352,30 +352,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
|
||||
|
||||
HttpRequestHeaders extra_request_headers;
|
||||
@@ -360,29 +360,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
|
||||
extra_request_headers.SetHeader("Accept", kDnsOverHttpResponseContentType);
|
||||
-
|
||||
|
||||
DCHECK(url_request_context);
|
||||
- request_ = url_request_context->CreateRequest(
|
||||
- url, request_priority_, this,
|
||||
- net::DefineNetworkTrafficAnnotation("dns_over_https", R"(
|
||||
@@ -215,7 +211,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
|
||||
net_log_ = request_->net_log();
|
||||
|
||||
if (use_post) {
|
||||
@@ -391,6 +368,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
|
||||
@@ -398,6 +376,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
|
||||
|
||||
request_->SetExtraRequestHeaders(extra_request_headers);
|
||||
request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
|
||||
@@ -223,10 +219,10 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
|
||||
LOAD_BYPASS_PROXY);
|
||||
request_->set_allow_credentials(false);
|
||||
}
|
||||
@@ -807,7 +785,7 @@ class DnsTransactionImpl : public DnsTransaction,
|
||||
had_tcp_attempt_(false),
|
||||
@@ -813,7 +792,7 @@ class DnsTransactionImpl : public DnsTransaction,
|
||||
doh_attempt_(false),
|
||||
first_server_index_(0),
|
||||
url_request_context_(url_request_context),
|
||||
- request_priority_(DEFAULT_PRIORITY) {
|
||||
+ request_priority_(MAXIMUM_PRIORITY) {
|
||||
DCHECK(session_.get());
|
||||
@@ -235,7 +231,7 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
|
||||
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
|
||||
--- a/net/url_request/url_request_http_job.cc
|
||||
+++ b/net/url_request/url_request_http_job.cc
|
||||
@@ -423,17 +423,21 @@ void URLRequestHttpJob::Start() {
|
||||
@@ -338,17 +338,21 @@ void URLRequestHttpJob::Start() {
|
||||
// plugin could set a referrer although sending the referrer is inhibited.
|
||||
request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer);
|
||||
|
||||
@@ -263,7 +259,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
|
||||
|
||||
AddExtraHeaders();
|
||||
AddCookieHeaderAndStart();
|
||||
@@ -652,10 +656,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
|
||||
@@ -571,10 +575,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
|
||||
} else {
|
||||
// Advertise "br" encoding only if transferred data is opaque to proxy.
|
||||
bool advertise_brotli = false;
|
||||
@@ -280,7 +276,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
|
||||
}
|
||||
}
|
||||
|
||||
@@ -673,7 +679,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
|
||||
@@ -592,7 +598,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
|
||||
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
||||
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
||||
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
||||
@@ -237,6 +237,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
|
||||
@@ -236,6 +236,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
|
||||
builtins_to_provide.push_back(
|
||||
base::ASCIIToUTF16(chrome::kChromeUIFlagsURL));
|
||||
builtins_to_provide.push_back(
|
||||
@@ -78,19 +78,19 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
||||
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
|
||||
--- a/chrome/browser/browser_resources.grd
|
||||
+++ b/chrome/browser/browser_resources.grd
|
||||
@@ -209,6 +209,8 @@
|
||||
<include name="IDR_SNIPPETS_INTERNALS_CSS" file="resources\snippets_internals\snippets_internals.css" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SNIPPETS_INTERNALS_JS" file="resources\snippets_internals\snippets_internals.js" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SNIPPETS_INTERNALS_MOJO_JS" file="${root_gen_dir}\chrome\browser\ui\webui\snippets_internals\snippets_internals.mojom.js" use_base_dir="false" type="BINDATA" compress="gzip" />
|
||||
@@ -213,6 +213,8 @@
|
||||
<include name="IDR_SNIPPETS_INTERNALS_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\snippets_internals\snippets_internals.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
|
||||
</if>
|
||||
<include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervised_user_internals\supervised_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
+ <include name="IDR_PROXY_CONFIG_HTML" file="resources\proxy_config.html" flattenhtml="true" type="BINDATA" compress="gzip" />
|
||||
+ <include name="IDR_PROXY_CONFIG_JS" file="resources\proxy_config.js" type="BINDATA" compress="gzip" />
|
||||
</if>
|
||||
<include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervised_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervised_user_internals.css" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervised_user_internals\supervised_user_internals.css" compress="gzip" type="BINDATA" />
|
||||
<include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervised_user_internals\supervised_user_internals.js" compress="gzip" type="BINDATA" />
|
||||
<if expr="enable_hangout_services_extension">
|
||||
diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc
|
||||
--- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
|
||||
+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
|
||||
@@ -158,7 +158,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
|
||||
@@ -160,7 +160,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
|
||||
SetValue(
|
||||
proxy_config::prefs::kProxy,
|
||||
std::make_unique<base::Value>(ProxyConfigDictionary::CreateFixedServers(
|
||||
@@ -508,7 +508,7 @@ new file mode 100644
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -266,6 +266,8 @@ jumbo_split_static_library("ui") {
|
||||
@@ -272,6 +272,8 @@ jumbo_split_static_library("ui") {
|
||||
"webui/metrics_handler.h",
|
||||
"webui/net_export_ui.cc",
|
||||
"webui/net_export_ui.h",
|
||||
@@ -520,15 +520,15 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
@@ -51,6 +51,7 @@
|
||||
#include "chrome/browser/ui/webui/policy_tool_ui.h"
|
||||
@@ -52,6 +52,7 @@
|
||||
#include "chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h"
|
||||
#include "chrome/browser/ui/webui/policy_ui.h"
|
||||
#include "chrome/browser/ui/webui/predictors/predictors_ui.h"
|
||||
+#include "chrome/browser/ui/webui/proxy_config_ui.h"
|
||||
#include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"
|
||||
#include "chrome/browser/ui/webui/settings/md_settings_ui.h"
|
||||
#include "chrome/browser/ui/webui/settings/settings_ui.h"
|
||||
#include "chrome/browser/ui/webui/settings_utils.h"
|
||||
@@ -378,6 +379,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
||||
@@ -388,6 +389,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
||||
return &NewWebUI<MemoryInternalsUI>;
|
||||
if (url.host_piece() == chrome::kChromeUINetExportHost)
|
||||
return &NewWebUI<NetExportUI>;
|
||||
@@ -982,7 +982,7 @@ new file mode 100644
|
||||
diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
|
||||
--- a/chrome/common/webui_url_constants.cc
|
||||
+++ b/chrome/common/webui_url_constants.cc
|
||||
@@ -182,6 +182,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] =
|
||||
@@ -178,6 +178,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] =
|
||||
const char kChromeUINativeScheme[] = "chrome-native";
|
||||
const char kChromeUIOfflineInternalsHost[] = "offline-internals";
|
||||
const char kChromeUIPhysicalWebDiagnosticsHost[] = "physical-web-diagnostics";
|
||||
@@ -991,7 +991,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
|
||||
const char kChromeUISnippetsInternalsHost[] = "snippets-internals";
|
||||
const char kChromeUIWebApksHost[] = "webapks";
|
||||
#endif
|
||||
@@ -351,6 +353,7 @@ const char* const kChromeHostURLs[] = {
|
||||
@@ -398,6 +400,7 @@ const char* const kChromeHostURLs[] = {
|
||||
kChromeUIPasswordManagerInternalsHost,
|
||||
kChromeUIPolicyHost,
|
||||
kChromeUIPredictorsHost,
|
||||
@@ -999,7 +999,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
|
||||
kChromeUIQuotaInternalsHost,
|
||||
kChromeUISignInInternalsHost,
|
||||
kChromeUISiteEngagementHost,
|
||||
@@ -385,6 +388,7 @@ const char* const kChromeHostURLs[] = {
|
||||
@@ -432,6 +435,7 @@ const char* const kChromeHostURLs[] = {
|
||||
#if !defined(OS_ANDROID)
|
||||
#if !defined(OS_CHROMEOS)
|
||||
kChromeUIAppLauncherPageHost,
|
||||
@@ -1022,12 +1022,12 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const
|
||||
diff --git a/components/policy/core/browser/proxy_policy_handler.cc b/components/policy/core/browser/proxy_policy_handler.cc
|
||||
--- a/components/policy/core/browser/proxy_policy_handler.cc
|
||||
+++ b/components/policy/core/browser/proxy_policy_handler.cc
|
||||
@@ -203,7 +203,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
|
||||
@@ -199,7 +199,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
|
||||
bypass_list->GetAsString(&bypass_list_string);
|
||||
prefs->SetValue(proxy_config::prefs::kProxy,
|
||||
std::make_unique<base::Value>(
|
||||
ProxyConfigDictionary::CreateFixedServers(
|
||||
- proxy_server, bypass_list_string)));
|
||||
+ proxy_server, bypass_list_string, false)));
|
||||
ProxyConfigDictionary::CreateFixedServers(
|
||||
- proxy_server, bypass_list_string));
|
||||
+ proxy_server, bypass_list_string, false));
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -5,21 +5,32 @@ Subject: Add an always-incognito mode
|
||||
More specifically, add a preference that causes all new tabs and all
|
||||
clicked links to launch as incognito.
|
||||
---
|
||||
chrome/android/chrome_java_sources.gni | 1 +
|
||||
.../android/java/res/xml/privacy_preferences.xml | 5 ++
|
||||
.../browser/AlwaysIncognitoLinkInterceptor.java | 73 ++++++++++++++++++++++
|
||||
.../chromium/chrome/browser/ChromeActivity.java | 4 ++
|
||||
.../chromium/chrome/browser/ChromeActivity.java | 5 ++
|
||||
.../chrome/browser/appmenu/AppMenuHandler.java | 12 ++++
|
||||
.../contextmenu/ChromeContextMenuPopulator.java | 9 ++-
|
||||
.../chrome/browser/tabmodel/ChromeTabCreator.java | 24 ++++++-
|
||||
.../java/strings/android_chrome_strings.grd | 6 ++
|
||||
chrome/android/java_sources.gni | 1 +
|
||||
8 files changed, 132 insertions(+), 2 deletions(-)
|
||||
8 files changed, 133 insertions(+), 2 deletions(-)
|
||||
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
|
||||
|
||||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -3,6 +3,7 @@
|
||||
# found in the LICENSE file.
|
||||
|
||||
chrome_java_sources = [
|
||||
+ "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java",
|
||||
"java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/ActivityTabTaskDescriptionHelper.java",
|
||||
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
--- a/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
@@ -40,6 +40,11 @@
|
||||
@@ -39,6 +39,11 @@
|
||||
android:key="usage_and_crash_reports"
|
||||
android:title="@string/usage_and_crash_reports_title_legacy"
|
||||
android:fragment="org.chromium.chrome.browser.preferences.privacy.UsageAndCrashReportsPreferenceFragment" />
|
||||
@@ -112,15 +123,16 @@ new file mode 100644
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
@@ -261,6 +261,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
|
||||
@@ -242,6 +242,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
|
||||
private static final int RECORD_MULTI_WINDOW_SCREEN_WIDTH_DELAY_MS = 5000;
|
||||
|
||||
// Observes when sync becomes ready to create the mContextReporter.
|
||||
+ private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
|
||||
private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener;
|
||||
|
||||
@Nullable
|
||||
@@ -1728,6 +1729,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
+
|
||||
/**
|
||||
* Timeout in ms for reading PartnerBrowserCustomizations provider.
|
||||
*/
|
||||
@@ -1729,6 +1731,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
throw new IllegalStateException(
|
||||
"Attempting to access TabCreator before initialization");
|
||||
}
|
||||
@@ -139,9 +151,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
|
||||
import org.chromium.base.metrics.RecordUserAction;
|
||||
+import org.chromium.base.ContextUtils;
|
||||
import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.widget.textbubble.TextBubble;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -26,6 +27,9 @@ import java.util.ArrayList;
|
||||
@@ -27,6 +28,9 @@ import java.util.ArrayList;
|
||||
* AppMenuObservers about these actions.
|
||||
*/
|
||||
public class AppMenuHandler {
|
||||
@@ -151,7 +163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
|
||||
private AppMenu mAppMenu;
|
||||
private AppMenuDragHelper mAppMenuDragHelper;
|
||||
private Menu mMenu;
|
||||
@@ -167,6 +171,14 @@ public class AppMenuHandler {
|
||||
@@ -184,6 +188,14 @@ public class AppMenuHandler {
|
||||
if (mDelegate.shouldShowHeader(appRect.height())) {
|
||||
headerResourceId = mDelegate.getHeaderResourceId();
|
||||
}
|
||||
@@ -164,8 +176,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
|
||||
+ }
|
||||
+
|
||||
mAppMenu.show(wrapper, anchorView, isByPermanentButton, rotation, appRect, pt.y,
|
||||
footerResourceId, headerResourceId, mHighlightMenuId, showFromBottom);
|
||||
mAppMenuDragHelper.onShow(startDragging);
|
||||
footerResourceId, headerResourceId, mHighlightMenuId, mCircleHighlight,
|
||||
showFromBottom);
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
||||
@@ -213,15 +225,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
|
||||
import org.chromium.chrome.browser.ChromeActivity;
|
||||
import org.chromium.chrome.browser.IntentHandler;
|
||||
import org.chromium.chrome.browser.ServiceTabLauncher;
|
||||
@@ -16,6 +18,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
|
||||
import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
|
||||
@@ -16,6 +18,7 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
|
||||
import org.chromium.chrome.browser.tab.Tab;
|
||||
import org.chromium.chrome.browser.tab.TabDelegateFactory;
|
||||
import org.chromium.chrome.browser.tab.TabAssociatedApp;
|
||||
import org.chromium.chrome.browser.tab.TabBuilder;
|
||||
+import org.chromium.chrome.browser.tab.TabObserver;
|
||||
import org.chromium.chrome.browser.tab.TabDelegateFactory;
|
||||
import org.chromium.chrome.browser.tab.TabParentIntent;
|
||||
import org.chromium.chrome.browser.tab.TabRedirectHandler;
|
||||
import org.chromium.chrome.browser.tab.TabState;
|
||||
import org.chromium.chrome.browser.util.IntentUtils;
|
||||
@@ -33,6 +36,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
@@ -35,6 +38,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
|
||||
private final ChromeActivity mActivity;
|
||||
private final boolean mIncognito;
|
||||
@@ -229,7 +241,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
|
||||
|
||||
private WindowAndroid mNativeWindow;
|
||||
private TabModel mTabModel;
|
||||
@@ -44,6 +48,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
@@ -45,6 +49,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
mActivity = activity;
|
||||
mNativeWindow = nativeWindow;
|
||||
mIncognito = incognito;
|
||||
@@ -241,7 +253,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -154,6 +163,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
@@ -169,6 +178,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
tab.getWebContents());
|
||||
}
|
||||
|
||||
@@ -252,19 +264,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
|
||||
mTabModel.addTab(tab, position, type);
|
||||
return tab;
|
||||
} finally {
|
||||
@@ -178,6 +191,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
Tab tab = Tab.createLiveTab(
|
||||
Tab.INVALID_TAB_ID, mIncognito, mNativeWindow, type, parentId, !openInForeground);
|
||||
tab.initialize(webContents, mTabContentManager, delegateFactory, !openInForeground, false);
|
||||
@@ -197,6 +210,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
.setWindow(mNativeWindow)
|
||||
.setLaunchType(type)
|
||||
.build();
|
||||
+
|
||||
+ if (mExtraLogic != null) {
|
||||
+ tab.addObserver(mExtraLogic);
|
||||
+ }
|
||||
+
|
||||
tab.initialize(webContents, delegateFactory, !openInForeground, null, false);
|
||||
mTabModel.addTab(tab, position, type);
|
||||
return true;
|
||||
}
|
||||
@@ -220,7 +238,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
@@ -240,7 +258,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
*/
|
||||
public Tab launchUrlFromExternalApp(String url, String referer, String headers,
|
||||
String appId, boolean forceNewTab, Intent intent, long intentTimestamp) {
|
||||
@@ -272,9 +284,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
|
||||
boolean isLaunchedFromChrome = TextUtils.equals(appId, mActivity.getPackageName());
|
||||
|
||||
// If an external app sends an intent for a Weblite URL and the Data Reduction Proxy is
|
||||
@@ -280,6 +297,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
tab.initialize(
|
||||
null, mTabContentManager, createDefaultTabDelegateFactory(), !selectTab, false);
|
||||
@@ -305,6 +322,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
|
||||
state.isIncognito());
|
||||
tab.initialize(null, createDefaultTabDelegateFactory(), !selectTab, state, false);
|
||||
assert state.isIncognito() == mIncognito;
|
||||
+
|
||||
+ if (mExtraLogic != null) {
|
||||
@@ -287,9 +299,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
|
||||
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
--- a/chrome/android/java/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
@@ -685,6 +685,12 @@ CHAR-LIMIT guidelines:
|
||||
@@ -736,6 +736,12 @@ CHAR-LIMIT guidelines:
|
||||
<message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_SUMMARY" desc="Body text for Chrome setting under 'Help Improve Safe Browsing'. This feature sends small amounts of data to Google about potentially-dangerous pages to help Safe Browsing improve Chrome's protection against malware and phishing.">
|
||||
Sends some system information and page content to Google
|
||||
To detect dangerous apps and sites, Chrome sends URLs of some pages you visit, limited system information, and some page content to Google
|
||||
</message>
|
||||
+ <message name="IDS_ALWAYS_INCOGNITO_TITLE" desc="Title for always incognito mode">
|
||||
+ Open links in incognito tabs always
|
||||
@@ -298,19 +310,8 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
|
||||
+ Opens links in incognito tabs when you click on new tab or on a link
|
||||
+ </message>
|
||||
<message name="IDS_SAFE_BROWSING_TITLE" desc="Title for safe browsing.">
|
||||
Safe Browsing
|
||||
Safe Browsing (protects you and your device from dangerous sites)
|
||||
</message>
|
||||
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
|
||||
--- a/chrome/android/java_sources.gni
|
||||
+++ b/chrome/android/java_sources.gni
|
||||
@@ -10,6 +10,7 @@ import("//components/offline_pages/buildflags/features.gni")
|
||||
import("//device/vr/buildflags/buildflags.gni")
|
||||
|
||||
chrome_java_sources = [
|
||||
+ "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java",
|
||||
"java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/ActivityTabTaskDescriptionHelper.java",
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -24,11 +24,11 @@ Completely remove contacts picker permission from the file dialog
|
||||
chrome/utility/BUILD.gn | 7 +-
|
||||
chrome/utility/importer/bookmark_html_reader.cc | 27 ++-
|
||||
chrome/utility/importer/bookmark_html_reader.h | 9 +
|
||||
.../src/org/chromium/ui/base/SelectFileDialog.java | 18 +-
|
||||
.../src/org/chromium/ui/base/SelectFileDialog.java | 16 +-
|
||||
ui/shell_dialogs/select_file_dialog.h | 2 +
|
||||
ui/shell_dialogs/select_file_dialog_android.cc | 6 +
|
||||
ui/shell_dialogs/select_file_dialog_android.h | 2 +
|
||||
22 files changed, 445 insertions(+), 15 deletions(-)
|
||||
22 files changed, 445 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
||||
--- a/chrome/android/java/AndroidManifest.xml
|
||||
@@ -46,21 +46,21 @@ diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/
|
||||
+++ b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
|
||||
@@ -22,6 +22,20 @@
|
||||
app:showAsAction="ifRoom"
|
||||
app:iconTint="@color/dark_mode_tint" />
|
||||
app:iconTint="@color/standard_mode_tint" />
|
||||
<item
|
||||
+ android:id="@+id/import_menu_id"
|
||||
+ android:icon="@drawable/ic_folder_blue_24dp"
|
||||
+ android:title="@string/import_bookmarks"
|
||||
+ android:visible="true"
|
||||
+ app:showAsAction="ifRoom"
|
||||
+ app:iconTint="@color/dark_mode_tint" />
|
||||
+ app:iconTint="@color/standard_mode_tint" />
|
||||
+ <item
|
||||
+ android:id="@+id/export_menu_id"
|
||||
+ android:icon="@drawable/ic_file_download_white_24dp"
|
||||
+ android:title="@string/export_bookmarks"
|
||||
+ android:visible="true"
|
||||
+ app:showAsAction="ifRoom"
|
||||
+ app:iconTint="@color/dark_mode_tint" />
|
||||
+ app:iconTint="@color/standard_mode_tint" />
|
||||
+ <item
|
||||
android:id="@+id/close_menu_id"
|
||||
android:icon="@drawable/btn_close"
|
||||
@@ -185,7 +185,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -508,6 +516,24 @@ public class BookmarkBridge {
|
||||
@@ -507,6 +515,24 @@ public class BookmarkBridge {
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -210,7 +210,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
||||
* Synchronously gets a list of bookmarks that match the specified search query.
|
||||
* @param query Keyword used for searching bookmarks.
|
||||
* @param maxNumberOfResult Maximum number of result to fetch.
|
||||
@@ -840,6 +866,24 @@ public class BookmarkBridge {
|
||||
@@ -839,6 +865,24 @@ public class BookmarkBridge {
|
||||
depthList.add(depth);
|
||||
}
|
||||
|
||||
@@ -235,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
||||
private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
|
||||
List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
|
||||
for (int i = 0; i < left.length; i++) {
|
||||
@@ -906,6 +950,8 @@ public class BookmarkBridge {
|
||||
@@ -905,6 +949,8 @@ public class BookmarkBridge {
|
||||
boolean getFolders, boolean getBookmarks, List<BookmarkId> bookmarksList);
|
||||
private native BookmarkId nativeGetChildAt(long nativeBookmarkBridge, long id, int type,
|
||||
int index);
|
||||
@@ -275,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
||||
import org.chromium.chrome.browser.favicon.LargeIconBridge;
|
||||
import org.chromium.chrome.browser.native_page.BasicNativePage;
|
||||
import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader;
|
||||
@@ -31,6 +32,7 @@ import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
|
||||
@@ -32,6 +33,7 @@ import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
|
||||
import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate;
|
||||
import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
|
||||
import org.chromium.components.bookmarks.BookmarkId;
|
||||
@@ -283,7 +283,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
||||
|
||||
import java.util.Stack;
|
||||
|
||||
@@ -55,6 +57,7 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
|
||||
@@ -56,6 +58,7 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
|
||||
private Activity mActivity;
|
||||
private ViewGroup mMainView;
|
||||
private BookmarkModel mBookmarkModel;
|
||||
@@ -291,7 +291,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
||||
private BookmarkUndoController mUndoController;
|
||||
private final ObserverList<BookmarkUIObserver> mUIObservers = new ObserverList<>();
|
||||
private BasicNativePage mNativePage;
|
||||
@@ -266,6 +269,13 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
|
||||
@@ -275,6 +278,13 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -305,7 +305,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
||||
* @return Current URL representing the UI state of bookmark manager. If no state has been shown
|
||||
* yet in this session, on phone return last used state stored in preference; on tablet
|
||||
* return the url previously set by {@link #updateForUrl(String)}.
|
||||
@@ -413,6 +423,16 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
|
||||
@@ -422,6 +432,16 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -329,14 +329,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
||||
mManager = new BookmarkManager(
|
||||
activity, false, ((SnackbarManageable) activity).getSnackbarManager());
|
||||
mManager.setBasicNativePage(this);
|
||||
+ mManager.setWindow(activity.getWindowAndroid());
|
||||
+ mManager.setWindow(activity.getWindowAndroid());
|
||||
mManager.setTab(host.getActiveTab());
|
||||
mTitle = activity.getString(R.string.bookmarks);
|
||||
}
|
||||
|
||||
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
--- a/chrome/android/java/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
@@ -224,6 +224,12 @@ CHAR-LIMIT guidelines:
|
||||
@@ -233,6 +233,12 @@ CHAR-LIMIT guidelines:
|
||||
<message name="IDS_SEARCH" desc="The label for a search button.">
|
||||
Search
|
||||
</message>
|
||||
@@ -352,7 +352,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -163,6 +163,10 @@ jumbo_split_static_library("browser") {
|
||||
@@ -165,6 +165,10 @@ jumbo_split_static_library("browser") {
|
||||
"bitmap_fetcher/bitmap_fetcher_service.h",
|
||||
"bitmap_fetcher/bitmap_fetcher_service_factory.cc",
|
||||
"bitmap_fetcher/bitmap_fetcher_service_factory.h",
|
||||
@@ -363,7 +363,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
"bookmarks/bookmark_model_factory.cc",
|
||||
"bookmarks/bookmark_model_factory.h",
|
||||
"bookmarks/bookmark_stats.cc",
|
||||
@@ -2665,8 +2669,6 @@ jumbo_split_static_library("browser") {
|
||||
@@ -2797,8 +2801,6 @@ jumbo_split_static_library("browser") {
|
||||
"banners/app_banner_infobar_delegate_desktop.h",
|
||||
"banners/app_banner_manager_desktop.cc",
|
||||
"banners/app_banner_manager_desktop.h",
|
||||
@@ -372,7 +372,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
"certificate_viewer.h",
|
||||
"chrome_browser_field_trials_desktop.cc",
|
||||
"chrome_browser_field_trials_desktop.h",
|
||||
@@ -2755,8 +2757,6 @@ jumbo_split_static_library("browser") {
|
||||
@@ -2888,8 +2890,6 @@ jumbo_split_static_library("browser") {
|
||||
"importer/importer_uma.h",
|
||||
"importer/in_process_importer_bridge.cc",
|
||||
"importer/in_process_importer_bridge.h",
|
||||
@@ -384,13 +384,14 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc
|
||||
--- a/chrome/browser/android/bookmarks/bookmark_bridge.cc
|
||||
+++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc
|
||||
@@ -9,18 +9,29 @@
|
||||
@@ -9,19 +9,30 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
+#include "base/android/content_uri_utils.h"
|
||||
#include "base/android/jni_array.h"
|
||||
#include "base/android/jni_string.h"
|
||||
#include "base/bind.h"
|
||||
+#include "base/android/path_utils.h"
|
||||
#include "base/containers/stack.h"
|
||||
#include "base/containers/stack_container.h"
|
||||
@@ -414,7 +415,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
|
||||
#include "components/bookmarks/browser/bookmark_model.h"
|
||||
#include "components/bookmarks/browser/bookmark_utils.h"
|
||||
#include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
|
||||
@@ -30,10 +41,13 @@
|
||||
@@ -31,10 +42,13 @@
|
||||
#include "components/bookmarks/managed/managed_bookmark_service.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/query_parser/query_parser.h"
|
||||
@@ -428,7 +429,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
|
||||
#include "services/identity/public/cpp/identity_manager.h"
|
||||
|
||||
using base::android::AttachCurrentThread;
|
||||
@@ -53,6 +67,57 @@ using bookmarks::BookmarkPermanentNode;
|
||||
@@ -54,6 +68,57 @@ using bookmarks::BookmarkPermanentNode;
|
||||
using bookmarks::BookmarkType;
|
||||
using content::BrowserThread;
|
||||
|
||||
@@ -486,7 +487,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
|
||||
namespace {
|
||||
|
||||
class BookmarkTitleComparer {
|
||||
@@ -129,6 +194,10 @@ BookmarkBridge::~BookmarkBridge() {
|
||||
@@ -130,6 +195,10 @@ BookmarkBridge::~BookmarkBridge() {
|
||||
bookmark_model_->RemoveObserver(this);
|
||||
if (partner_bookmarks_shim_)
|
||||
partner_bookmarks_shim_->RemoveObserver(this);
|
||||
@@ -497,7 +498,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
|
||||
}
|
||||
|
||||
void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef<jobject>&) {
|
||||
@@ -474,6 +543,152 @@ jint BookmarkBridge::GetTotalBookmarkCount(
|
||||
@@ -475,6 +544,152 @@ jint BookmarkBridge::GetTotalBookmarkCount(
|
||||
return count;
|
||||
}
|
||||
|
||||
@@ -517,7 +518,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
|
||||
+ //NOTE: extension and description are not used on Android, thus not set
|
||||
+ ui::SelectFileDialog::FileTypeInfo file_type_info;
|
||||
+
|
||||
+ static const std::vector<base::string16> v_accept_types = { base::UTF8ToUTF16("text/html") };
|
||||
+ const std::vector<base::string16> v_accept_types = { base::UTF8ToUTF16("text/html") };
|
||||
+
|
||||
+ // Android needs the original MIME types and an additional capture value.
|
||||
+ std::pair<std::vector<base::string16>, bool> accept_types =
|
||||
@@ -775,7 +776,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
|
||||
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -440,6 +440,9 @@ static_library("common") {
|
||||
@@ -442,6 +442,9 @@ static_library("common") {
|
||||
sources += [
|
||||
"media/chrome_media_drm_bridge_client.cc",
|
||||
"media/chrome_media_drm_bridge_client.h",
|
||||
@@ -788,7 +789,7 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
|
||||
diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
|
||||
--- a/chrome/utility/BUILD.gn
|
||||
+++ b/chrome/utility/BUILD.gn
|
||||
@@ -61,8 +61,6 @@ static_library("utility") {
|
||||
@@ -60,8 +60,6 @@ static_library("utility") {
|
||||
|
||||
if (!is_android) {
|
||||
sources += [
|
||||
@@ -797,7 +798,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
|
||||
"importer/bookmarks_file_importer.cc",
|
||||
"importer/bookmarks_file_importer.h",
|
||||
"importer/edge_database_reader_win.cc",
|
||||
@@ -173,6 +171,11 @@ static_library("utility") {
|
||||
@@ -170,6 +168,11 @@ static_library("utility") {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -918,15 +919,15 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/imp
|
||||
diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
|
||||
--- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
|
||||
+++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
|
||||
@@ -32,6 +32,7 @@ import org.chromium.base.task.AsyncTask;
|
||||
import org.chromium.ui.ContactsPickerListener;
|
||||
@@ -32,6 +32,7 @@ import org.chromium.base.task.PostTask;
|
||||
import org.chromium.base.task.TaskTraits;
|
||||
import org.chromium.ui.PhotoPickerListener;
|
||||
import org.chromium.ui.R;
|
||||
+import org.chromium.ui.widget.Toast;
|
||||
import org.chromium.ui.UiUtils;
|
||||
|
||||
import java.io.File;
|
||||
@@ -52,6 +53,7 @@ public class SelectFileDialog
|
||||
@@ -51,6 +52,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
|
||||
private static final String IMAGE_TYPE = "image/";
|
||||
private static final String VIDEO_TYPE = "video/";
|
||||
private static final String AUDIO_TYPE = "audio/";
|
||||
@@ -934,7 +935,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
|
||||
private static final String ALL_IMAGE_TYPES = IMAGE_TYPE + "*";
|
||||
private static final String ALL_VIDEO_TYPES = VIDEO_TYPE + "*";
|
||||
private static final String ALL_AUDIO_TYPES = AUDIO_TYPE + "*";
|
||||
@@ -130,6 +132,11 @@ public class SelectFileDialog
|
||||
@@ -129,6 +131,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
|
||||
mFileTypes = fileTypes;
|
||||
}
|
||||
|
||||
@@ -946,27 +947,25 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
|
||||
/**
|
||||
* Creates and starts an intent based on the passed fileTypes and capture value.
|
||||
* @param fileTypes MIME types requested (i.e. "image/*")
|
||||
@@ -159,7 +166,7 @@ public class SelectFileDialog
|
||||
if (!window.hasPermission(Manifest.permission.READ_CONTACTS)) {
|
||||
missingPermissions.add(Manifest.permission.READ_CONTACTS);
|
||||
}
|
||||
- } else if (shouldUsePhotoPicker()) {
|
||||
+ } else if (shouldUsePhotoPicker() || shouldShowHtmlTypes()) {
|
||||
if (!window.hasPermission(Manifest.permission.READ_EXTERNAL_STORAGE)) {
|
||||
missingPermissions.add(Manifest.permission.READ_EXTERNAL_STORAGE);
|
||||
}
|
||||
@@ -326,9 +333,7 @@ public class SelectFileDialog
|
||||
* 3.) There is a valid Android Activity associated with the file request.
|
||||
*/
|
||||
private boolean shouldUseContactsPicker() {
|
||||
- if (mFileTypes.size() != 1) return false;
|
||||
- if (!mFileTypes.get(0).equals("text/json+contacts")) return false;
|
||||
- return UiUtils.shouldShowContactsPicker() && mWindowAndroid.getActivity().get() != null;
|
||||
+ return false;
|
||||
}
|
||||
@@ -156,7 +163,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
|
||||
List<String> missingPermissions = new ArrayList<>();
|
||||
String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE;
|
||||
boolean shouldUsePhotoPicker = shouldUsePhotoPicker();
|
||||
- if (shouldUsePhotoPicker) {
|
||||
+ if (shouldUsePhotoPicker || shouldShowHtmlTypes()) {
|
||||
if (!window.hasPermission(storagePermission)) missingPermissions.add(storagePermission);
|
||||
} else {
|
||||
if (((mSupportsImageCapture && shouldShowImageTypes())
|
||||
@@ -183,7 +190,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -349,6 +354,7 @@ public class SelectFileDialog
|
||||
- if (shouldUsePhotoPicker
|
||||
+ if ((shouldUsePhotoPicker || shouldShowHtmlTypes())
|
||||
&& requestPermissions[i].equals(storagePermission)) {
|
||||
onFileNotSelected();
|
||||
return;
|
||||
@@ -331,6 +338,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
|
||||
}
|
||||
if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
|
||||
}
|
||||
@@ -974,7 +973,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
|
||||
return mimeTypes;
|
||||
}
|
||||
|
||||
@@ -652,6 +658,10 @@ public class SelectFileDialog
|
||||
@@ -603,6 +611,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
|
||||
return countAcceptTypesFor(specificType) > 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,22 +26,22 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
|
||||
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
--- a/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
@@ -48,6 +48,11 @@
|
||||
android:title="@string/clear_browsing_data_title"
|
||||
android:summary="@string/clear_browsing_data_summary"
|
||||
android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
|
||||
@@ -42,6 +42,11 @@
|
||||
android:key="contextual_search"
|
||||
android:title="@string/contextual_search_title"
|
||||
android:fragment="org.chromium.chrome.browser.preferences.privacy.ContextualSearchPreferenceFragment" />
|
||||
+ <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
|
||||
+ android:key="allow_custom_tab_intents"
|
||||
+ android:title="@string/allow_custom_tab_intents_title"
|
||||
+ android:summary="@string/allow_custom_tab_intents_summary"
|
||||
+ android:defaultValue="false" />
|
||||
<Preference
|
||||
android:key="sync_and_services_link_divider"
|
||||
android:layout="@layout/divider_preference"
|
||||
android:key="clear_browsing_data"
|
||||
android:title="@string/clear_browsing_data_title"
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
|
||||
@@ -41,6 +41,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
|
||||
@@ -42,6 +42,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
|
||||
import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
|
||||
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
@@ -49,14 +49,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
|
||||
import org.chromium.chrome.browser.searchwidget.SearchActivity;
|
||||
import org.chromium.chrome.browser.tab.Tab;
|
||||
import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
|
||||
@@ -275,6 +276,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
|
||||
@@ -272,6 +273,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
|
||||
*/
|
||||
public static boolean isCustomTabIntent(Intent intent) {
|
||||
if (intent == null) return false;
|
||||
+ if (!ContextUtils.getAppSharedPreferences().getBoolean(PrivacyPreferences.PREF_ALLOW_CUSTOM_TAB_INTENTS, false)) return false;
|
||||
if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent)
|
||||
|| !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) {
|
||||
return false;
|
||||
// CCT is disabled in noTouch mode except for some Chrome-internal exceptions.
|
||||
if (FeatureUtilities.isNoTouchModeEnabled()
|
||||
&& !IntentHandler.wasIntentSenderChrome(intent)) {
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
|
||||
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
|
||||
private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
|
||||
private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
|
||||
@@ -104,6 +105,11 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
@@ -100,6 +101,11 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
navigationErrorPref.setOnPreferenceChangeListener(this);
|
||||
navigationErrorPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
|
||||
|
||||
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
ChromeBaseCheckBoxPreference searchSuggestionsPref =
|
||||
(ChromeBaseCheckBoxPreference) findPreference(PREF_SEARCH_SUGGESTIONS);
|
||||
searchSuggestionsPref.setOnPreferenceChangeListener(this);
|
||||
@@ -135,6 +141,10 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
@@ -122,6 +128,10 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
recordNetworkPredictionEnablingUMA((boolean) newValue);
|
||||
} else if (PREF_NAVIGATION_ERROR.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setResolveNavigationErrorEnabled((boolean) newValue);
|
||||
@@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
--- a/chrome/android/java/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
@@ -4012,6 +4012,13 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from
|
||||
@@ -4063,6 +4063,13 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
Browse
|
||||
</message>
|
||||
|
||||
|
||||
@@ -25,9 +25,9 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
@@ -2138,6 +2138,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
RecordUserAction.record("MobileMenuSettings");
|
||||
@@ -2150,6 +2150,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
} else if (id == R.id.show_menu) {
|
||||
if (FeatureUtilities.isNoTouchModeEnabled()) return false;
|
||||
showAppMenuForKeyboardEvent();
|
||||
+ } else if (id == R.id.exit_id) {
|
||||
+ ApplicationLifetime.terminate(false);
|
||||
@@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
|
||||
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
--- a/chrome/android/java/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
@@ -3054,6 +3054,9 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
@@ -3142,6 +3142,9 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
<message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
|
||||
Settings
|
||||
</message>
|
||||
|
||||
@@ -18,7 +18,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -809,6 +809,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
|
||||
@@ -652,6 +652,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
|
||||
net::kEffectiveConnectionType4G},
|
||||
};
|
||||
|
||||
@@ -30,22 +30,22 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
// Ensure that all effective connection types returned by Network Quality
|
||||
// Estimator (NQE) are also exposed via flags.
|
||||
static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
|
||||
@@ -2357,6 +2362,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kMaterialDesignIncognitoNTPName,
|
||||
flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)},
|
||||
@@ -2204,6 +2209,9 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
flag_descriptions::kPassiveDocumentEventListenersName,
|
||||
flag_descriptions::kPassiveDocumentEventListenersDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kPassiveDocumentEventListeners)},
|
||||
+ {"max-connections-per-host", flag_descriptions::kMaxConnectionsPerHostName,
|
||||
+ flag_descriptions::kMaxConnectionsPerHostDescription, kOsAll,
|
||||
+ MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)},
|
||||
{"safe-search-url-reporting",
|
||||
flag_descriptions::kSafeSearchUrlReportingName,
|
||||
flag_descriptions::kSafeSearchUrlReportingDescription, kOsAll,
|
||||
{"document-passive-wheel-event-listeners",
|
||||
flag_descriptions::kPassiveDocumentWheelEventListenersName,
|
||||
flag_descriptions::kPassiveDocumentWheelEventListenersDescription, kOsAll,
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -1264,6 +1264,10 @@ const char kMaterialDesignIncognitoNTPDescription[] =
|
||||
"If enabled, the Incognito New Tab page uses the new material design with "
|
||||
"a better readable text.";
|
||||
@@ -1273,6 +1273,10 @@ const char kLookalikeUrlNavigationSuggestionsDescription[] =
|
||||
const char kMarkHttpAsName[] = "Mark non-secure origins as non-secure";
|
||||
const char kMarkHttpAsDescription[] = "Change the UI treatment for HTTP pages";
|
||||
|
||||
+const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
|
||||
+const char kMaxConnectionsPerHostDescription[] =
|
||||
@@ -57,9 +57,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -766,6 +766,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
|
||||
extern const char kMaterialDesignIncognitoNTPName[];
|
||||
extern const char kMaterialDesignIncognitoNTPDescription[];
|
||||
@@ -779,6 +779,9 @@ extern const char kMarkHttpAsWarning[];
|
||||
extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[];
|
||||
extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
|
||||
|
||||
+extern const char kMaxConnectionsPerHostName[];
|
||||
+extern const char kMaxConnectionsPerHostDescription[];
|
||||
@@ -111,8 +111,8 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
|
||||
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
|
||||
--- a/net/socket/client_socket_pool_manager.cc
|
||||
+++ b/net/socket/client_socket_pool_manager.cc
|
||||
@@ -23,6 +23,10 @@
|
||||
#include "net/socket/transport_client_socket_pool.h"
|
||||
@@ -21,6 +21,10 @@
|
||||
#include "net/socket/ssl_connect_job.h"
|
||||
#include "net/socket/transport_connect_job.h"
|
||||
#include "net/ssl/ssl_config.h"
|
||||
+#include "components/network_session_configurator/common/network_switches.h"
|
||||
@@ -122,7 +122,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
|
||||
|
||||
namespace net {
|
||||
|
||||
@@ -297,6 +301,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
|
||||
@@ -262,6 +266,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
|
||||
int ClientSocketPoolManager::max_sockets_per_group(
|
||||
HttpNetworkSession::SocketPoolType pool_type) {
|
||||
DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
|
||||
|
||||
@@ -4,33 +4,17 @@ Subject: Add flag to control video playback resume feature
|
||||
|
||||
Disable it by default on Android as it is everywhere else
|
||||
---
|
||||
chrome/browser/about_flags.cc | 5 +++++
|
||||
chrome/browser/flag_descriptions.cc | 5 +++++
|
||||
chrome/browser/flag_descriptions.h | 3 +++
|
||||
media/base/media_switches.cc | 6 +-----
|
||||
4 files changed, 14 insertions(+), 5 deletions(-)
|
||||
3 files changed, 9 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -3947,6 +3947,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kSiteCharacteristicsDatabase)},
|
||||
#endif
|
||||
|
||||
+ {"resume-background-video",
|
||||
+ flag_descriptions::kResumeBackgroundVideoName,
|
||||
+ flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
|
||||
+ FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
|
||||
+
|
||||
#if defined(OS_MACOSX)
|
||||
{"enable-text-suggestions-touch-bar",
|
||||
flag_descriptions::kTextSuggestionsTouchBarName,
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -833,6 +833,11 @@ const char kEnablePictureInPictureDescription[] =
|
||||
"controls. The #enable-surfaces-for-videos flag must be enabled as well "
|
||||
"to use it.";
|
||||
@@ -860,6 +860,11 @@ const char kMemlogStackModeNative[] = "Native";
|
||||
const char kMemlogStackModeNativeWithThreadNames[] = "Native with thread names";
|
||||
const char kMemlogStackModePseudo[] = "Trace events";
|
||||
|
||||
+const char kResumeBackgroundVideoName[] = "Resume background video.";
|
||||
+const char kResumeBackgroundVideoDescription[] =
|
||||
@@ -43,7 +27,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -502,6 +502,9 @@ extern const char kOOPHPStackModePseudo[];
|
||||
@@ -517,6 +517,9 @@ extern const char kEnablePortalsDescription[];
|
||||
extern const char kEnablePictureInPictureName[];
|
||||
extern const char kEnablePictureInPictureDescription[];
|
||||
|
||||
@@ -56,7 +40,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
|
||||
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
|
||||
--- a/media/base/media_switches.cc
|
||||
+++ b/media/base/media_switches.cc
|
||||
@@ -212,11 +212,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
|
||||
@@ -207,11 +207,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
|
||||
// when in background.
|
||||
const base::Feature kResumeBackgroundVideo {
|
||||
"resume-background-video",
|
||||
|
||||
@@ -6,7 +6,7 @@ Subject: Add flag to disable IPv6 probes
|
||||
chrome/browser/about_flags.cc | 5 +++++
|
||||
chrome/browser/flag_descriptions.cc | 4 ++++
|
||||
chrome/browser/flag_descriptions.h | 3 +++
|
||||
net/dns/host_resolver_impl.cc | 10 ++++++++--
|
||||
net/dns/host_resolver_manager.cc | 10 ++++++++--
|
||||
services/network/public/cpp/features.cc | 3 +++
|
||||
services/network/public/cpp/features.h | 2 ++
|
||||
6 files changed, 25 insertions(+), 2 deletions(-)
|
||||
@@ -14,9 +14,9 @@ Subject: Add flag to disable IPv6 probes
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -3269,6 +3269,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kHandwritingGesture)},
|
||||
#endif // OS_CHROMEOS
|
||||
@@ -3006,6 +3006,11 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
kMarkHttpAsFeatureVariations,
|
||||
"HTTPReallyBadFinal")},
|
||||
|
||||
+ {"ipv6-probing",
|
||||
+ flag_descriptions::kIPv6ProbingName,
|
||||
@@ -24,28 +24,28 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
+ FEATURE_VALUE_TYPE(network::features::kIPv6Probing)},
|
||||
+
|
||||
#if !defined(OS_ANDROID)
|
||||
{"enable-picture-in-picture",
|
||||
flag_descriptions::kEnablePictureInPictureName,
|
||||
{"enable-web-authentication-testing-api",
|
||||
flag_descriptions::kEnableWebAuthenticationTestingAPIName,
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -835,6 +835,10 @@ const char kOOPHPStackModeNative[] = "Native";
|
||||
const char kOOPHPStackModeNativeWithThreadNames[] = "Native with thread names";
|
||||
const char kOOPHPStackModePseudo[] = "Trace events";
|
||||
@@ -2408,6 +2408,10 @@ const char kForegroundNotificationManagerDescription[] =
|
||||
const char kHomePageButtonName[] = "Force Enable Home Page Button";
|
||||
const char kHomePageButtonDescription[] = "Displays a home button if enabled.";
|
||||
|
||||
+const char kIPv6ProbingName[] = "Enable IPv6 probing.";
|
||||
+const char kIPv6ProbingDescription[] =
|
||||
+ "Send IPv6 probes to a RIPE DNS address to verify IPv6 connectivity.";
|
||||
+
|
||||
const char kEnablePictureInPictureName[] = "Enable Picture-in-Picture.";
|
||||
const char kEnablePictureInPictureDescription[] =
|
||||
"Show Picture-in-Picture in browser context menu and video native "
|
||||
const char kHomepageTileName[] =
|
||||
"Enable Homepage tile shown in Suggested Tiles";
|
||||
const char kHomepageTileDescription[] =
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -505,6 +505,9 @@ extern const char kOOPHPStackModeNative[];
|
||||
extern const char kOOPHPStackModeNativeWithThreadNames[];
|
||||
extern const char kOOPHPStackModePseudo[];
|
||||
@@ -520,6 +520,9 @@ extern const char kEnableNewDownloadBackendDescription[];
|
||||
extern const char kEnablePortalsName[];
|
||||
extern const char kEnablePortalsDescription[];
|
||||
|
||||
+extern const char kIPv6ProbingName[];
|
||||
+extern const char kIPv6ProbingDescription[];
|
||||
@@ -53,18 +53,18 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
|
||||
extern const char kEnablePictureInPictureName[];
|
||||
extern const char kEnablePictureInPictureDescription[];
|
||||
|
||||
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
|
||||
--- a/net/dns/host_resolver_impl.cc
|
||||
+++ b/net/dns/host_resolver_impl.cc
|
||||
@@ -82,6 +82,7 @@
|
||||
#include "net/log/net_log_with_source.h"
|
||||
diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
|
||||
--- a/net/dns/host_resolver_manager.cc
|
||||
+++ b/net/dns/host_resolver_manager.cc
|
||||
@@ -84,6 +84,7 @@
|
||||
#include "net/socket/client_socket_factory.h"
|
||||
#include "net/socket/datagram_client_socket.h"
|
||||
#include "net/url_request/url_request_context.h"
|
||||
+#include "services/network/public/cpp/features.h"
|
||||
#include "url/url_canon_ip.h"
|
||||
|
||||
#if BUILDFLAG(ENABLE_MDNS)
|
||||
@@ -2874,8 +2875,13 @@ bool HostResolverImpl::IsIPv6Reachable(const NetLogWithSource& net_log) {
|
||||
@@ -2896,8 +2897,13 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
|
||||
bool cached = true;
|
||||
if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
|
||||
kIPv6ProbePeriodMs) {
|
||||
@@ -83,7 +83,7 @@ diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
|
||||
diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
|
||||
--- a/services/network/public/cpp/features.cc
|
||||
+++ b/services/network/public/cpp/features.cc
|
||||
@@ -14,6 +14,9 @@ const base::Feature kExpectCTReporting{"ExpectCTReporting",
|
||||
@@ -16,6 +16,9 @@ const base::Feature kExpectCTReporting{"ExpectCTReporting",
|
||||
|
||||
const base::Feature kNetworkErrorLogging{"NetworkErrorLogging",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
@@ -91,8 +91,8 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c
|
||||
+const base::Feature kIPv6Probing{"IPv6Probing",
|
||||
+ base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
// Enables the network service.
|
||||
const base::Feature kNetworkService{"NetworkService",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
const base::Feature kNetworkService {
|
||||
"NetworkService",
|
||||
diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
|
||||
--- a/services/network/public/cpp/features.h
|
||||
+++ b/services/network/public/cpp/features.h
|
||||
|
||||
@@ -20,7 +20,7 @@ legacy acceleration events.
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -2770,6 +2770,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -2269,6 +2269,12 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-generic-sensor", flag_descriptions::kEnableGenericSensorName,
|
||||
flag_descriptions::kEnableGenericSensorDescription, kOsAll,
|
||||
FEATURE_VALUE_TYPE(features::kGenericSensor)},
|
||||
@@ -36,7 +36,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -599,6 +599,14 @@ const char kEnableGenericSensorDescription[] =
|
||||
@@ -631,6 +631,14 @@ const char kEnableGenericSensorDescription[] =
|
||||
"Accelerometer, LinearAccelerationSensor, Gyroscope, "
|
||||
"AbsoluteOrientationSensor and RelativeOrientationSensor interfaces.";
|
||||
|
||||
@@ -54,7 +54,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
||||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -391,6 +391,12 @@ extern const char kEnableEnumeratingAudioDevicesDescription[];
|
||||
@@ -398,6 +398,12 @@ extern const char kEnforceTLS13DowngradeDescription[];
|
||||
extern const char kEnableGenericSensorName[];
|
||||
extern const char kEnableGenericSensorDescription[];
|
||||
|
||||
@@ -70,7 +70,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
|
||||
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
|
||||
--- a/content/child/runtime_features.cc
|
||||
+++ b/content/child/runtime_features.cc
|
||||
@@ -144,6 +144,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
|
||||
@@ -90,6 +90,9 @@ void SetIndividualRuntimeFeatures(
|
||||
base::FeatureList::IsEnabled(features::kSharedArrayBuffer) ||
|
||||
base::FeatureList::IsEnabled(features::kWebAssemblyThreads));
|
||||
|
||||
@@ -83,10 +83,10 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
|
||||
diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
|
||||
--- a/content/public/common/content_features.cc
|
||||
+++ b/content/public/common/content_features.cc
|
||||
@@ -596,6 +596,16 @@ const base::Feature kWebRtcHideLocalIpsWithMdns{
|
||||
// https://wicg.github.io/webusb
|
||||
const base::Feature kWebUsb{"WebUSB", base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
|
||||
@@ -614,6 +614,16 @@ const base::Feature kExperimentalProductivityFeatures{
|
||||
// TODO(rouslan): Remove this.
|
||||
const base::Feature kWebPayments{"WebPayments",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
+// Enables the device motion API used to track device acceleration;
|
||||
+// no user authorization or notifications happens when in use.
|
||||
+const base::Feature kDeviceMotion{"DeviceMotion",
|
||||
@@ -97,14 +97,14 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
|
||||
+const base::Feature kDeviceOrientation{"DeviceOrientation",
|
||||
+ base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
+
|
||||
// Controls whether WebVR VSync-aligned render loop timing is enabled.
|
||||
const base::Feature kWebVrVsyncAlign{"WebVrVsyncAlign",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
|
||||
// Makes WebRTC use ECDSA certs by default (i.e., when no cert type was
|
||||
// specified in JS).
|
||||
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
|
||||
--- a/content/public/common/content_features.h
|
||||
+++ b/content/public/common/content_features.h
|
||||
@@ -155,6 +155,8 @@ CONTENT_EXPORT extern const char kWebXrRenderPathParamValueGpuFence[];
|
||||
CONTENT_EXPORT extern const char kWebXrRenderPathParamValueSharedBuffer[];
|
||||
@@ -156,6 +156,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess;
|
||||
CONTENT_EXPORT extern const base::Feature kWebNfc;
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
+CONTENT_EXPORT extern const base::Feature kDeviceMotion, kDeviceOrientation;
|
||||
@@ -123,11 +123,11 @@ diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_pa
|
||||
+ BLINK_PLATFORM_EXPORT static void EnableDeviceOrientation(bool);
|
||||
BLINK_PLATFORM_EXPORT static void EnableDecodeToYUV(bool);
|
||||
BLINK_PLATFORM_EXPORT static void EnableDisplayCutoutAPI(bool);
|
||||
BLINK_PLATFORM_EXPORT static void EnableFastMobileScrolling(bool);
|
||||
BLINK_PLATFORM_EXPORT static void EnableFallbackCursorMode(bool);
|
||||
diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_party/blink/renderer/modules/modules_initializer.cc
|
||||
--- a/third_party/blink/renderer/modules/modules_initializer.cc
|
||||
+++ b/third_party/blink/renderer/modules/modules_initializer.cc
|
||||
@@ -233,9 +233,12 @@ void ModulesInitializer::InitInspectorAgentSession(
|
||||
@@ -249,9 +249,12 @@ void ModulesInitializer::InitInspectorAgentSession(
|
||||
void ModulesInitializer::OnClearWindowObjectInMainWorld(
|
||||
Document& document,
|
||||
const Settings& settings) const {
|
||||
@@ -164,7 +164,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
|
||||
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -374,6 +374,14 @@
|
||||
@@ -425,6 +425,14 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -75,9 +75,9 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
@@ -2239,6 +2239,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent();
|
||||
currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange);
|
||||
@@ -2253,6 +2253,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
currentTab.getWebContents().getNavigationController().setUseDesktopUserAgent(
|
||||
!usingDesktopUserAgent, reloadOnChange);
|
||||
RecordUserAction.record("MobileMenuRequestDesktopSite");
|
||||
+ } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
|
||||
+ final boolean reloadOnChange = !currentTab.isNativePage();
|
||||
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -1720,6 +1720,14 @@ public class ChromeTabbedActivity
|
||||
@@ -1818,6 +1818,14 @@ public class ChromeTabbedActivity
|
||||
NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
|
||||
}
|
||||
RecordUserAction.record("MobileMenuDownloadManager");
|
||||
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
|
||||
import org.chromium.chrome.browser.ShortcutHelper;
|
||||
import org.chromium.chrome.browser.UrlConstants;
|
||||
import org.chromium.chrome.browser.banners.AppBannerManager;
|
||||
@@ -197,6 +198,8 @@ public class AppMenuPropertiesDelegate {
|
||||
@@ -196,6 +197,8 @@ public class AppMenuPropertiesDelegate {
|
||||
|
||||
updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
|
||||
|
||||
@@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
|
||||
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
--- a/chrome/android/java/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
@@ -3039,6 +3039,17 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
@@ -3127,6 +3127,17 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
<message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
|
||||
Find in page
|
||||
</message>
|
||||
|
||||
@@ -41,7 +41,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -1005,8 +1005,10 @@ public class ChromeTabbedActivity
|
||||
@@ -1112,8 +1112,10 @@ public class ChromeTabbedActivity
|
||||
boolean hadCipherData =
|
||||
CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
|
||||
|
||||
@@ -80,9 +80,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
private static final String PREF_DO_NOT_TRACK = "do_not_track";
|
||||
private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
|
||||
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
|
||||
@@ -94,6 +97,11 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
|
||||
preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
|
||||
@@ -67,6 +70,11 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
(ChromeBaseCheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
|
||||
canMakePaymentPref.setOnPreferenceChangeListener(this);
|
||||
|
||||
+ ChromeBaseCheckBoxPreference closeTabsOnExitPref =
|
||||
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
|
||||
@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
ChromeBaseCheckBoxPreference networkPredictionPref =
|
||||
(ChromeBaseCheckBoxPreference) findPreference(PREF_NETWORK_PREDICTIONS);
|
||||
networkPredictionPref.setChecked(prefServiceBridge.getNetworkPredictionEnabled());
|
||||
@@ -139,6 +147,12 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
@@ -126,6 +134,12 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
|
||||
recordNetworkPredictionEnablingUMA((boolean) newValue);
|
||||
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
--- a/chrome/android/java/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
@@ -3893,6 +3893,12 @@ However, you aren’t invisible. Going private doesn’t hide your browsing from
|
||||
@@ -3931,6 +3931,12 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
<message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
|
||||
IMAGE
|
||||
</message>
|
||||
|
||||
@@ -133,7 +133,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre
|
||||
import org.chromium.content_public.browser.LoadUrlParams;
|
||||
import org.chromium.content_public.browser.WebContents;
|
||||
|
||||
@@ -88,12 +89,18 @@ public interface TabCreatorManager {
|
||||
@@ -85,12 +86,18 @@ public interface TabCreatorManager {
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -157,7 +157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre
|
||||
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
--- a/chrome/android/java/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
@@ -637,6 +637,9 @@ CHAR-LIMIT guidelines:
|
||||
@@ -677,6 +677,9 @@ CHAR-LIMIT guidelines:
|
||||
<message name="IDS_OPTIONS_HOMEPAGE_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is opened when they tap on the home page button in the omnibox.">
|
||||
Open this page
|
||||
</message>
|
||||
@@ -170,8 +170,8 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
|
||||
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
|
||||
--- a/chrome/browser/ui/browser_ui_prefs.cc
|
||||
+++ b/chrome/browser/ui/browser_ui_prefs.cc
|
||||
@@ -56,6 +56,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
GetHomeButtonAndHomePageIsNewTabPageFlags());
|
||||
@@ -54,6 +54,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
GetHomeButtonAndHomePageIsNewTabPageFlags());
|
||||
registry->RegisterBooleanPref(prefs::kShowHomeButton, false,
|
||||
GetHomeButtonAndHomePageIsNewTabPageFlags());
|
||||
+ registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
|
||||
@@ -182,7 +182,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
|
||||
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
|
||||
--- a/chrome/common/pref_names.cc
|
||||
+++ b/chrome/common/pref_names.cc
|
||||
@@ -57,6 +57,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode";
|
||||
@@ -58,6 +58,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode";
|
||||
// A boolean specifying whether the New Tab page is the home page or not.
|
||||
const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage";
|
||||
|
||||
@@ -196,8 +196,8 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
|
||||
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
|
||||
--- a/chrome/common/pref_names.h
|
||||
+++ b/chrome/common/pref_names.h
|
||||
@@ -292,6 +292,7 @@ extern const char kMostRecentlyUsedNetworkFileShareURL[];
|
||||
extern const char kParentAccessCodeConfig[];
|
||||
@@ -294,6 +294,7 @@ extern const char kParentAccessCodeConfig[];
|
||||
extern const char kDeviceWallpaperImageFilePath[];
|
||||
#endif // defined(OS_CHROMEOS)
|
||||
extern const char kShowHomeButton[];
|
||||
+extern const char kNewTabPageIsHomePage[];
|
||||
|
||||
@@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
|
||||
/**
|
||||
* @return Whether third-party cookie blocking is configured by policy
|
||||
*/
|
||||
@@ -626,6 +630,10 @@ public class PrefServiceBridge {
|
||||
@@ -625,6 +629,10 @@ public class PrefServiceBridge {
|
||||
nativeSetBlockThirdPartyCookiesEnabled(enabled);
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
|
||||
public void setDoNotTrackEnabled(boolean enabled) {
|
||||
nativeSetDoNotTrackEnabled(enabled);
|
||||
}
|
||||
@@ -1074,6 +1082,7 @@ public class PrefServiceBridge {
|
||||
@@ -1073,6 +1081,7 @@ public class PrefServiceBridge {
|
||||
private native boolean nativeGetAutoplayEnabled();
|
||||
private native boolean nativeGetBackgroundSyncEnabled();
|
||||
private native boolean nativeGetBlockThirdPartyCookiesEnabled();
|
||||
@@ -74,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
|
||||
private native boolean nativeGetBlockThirdPartyCookiesManaged();
|
||||
private native boolean nativeGetRememberPasswordsEnabled();
|
||||
private native boolean nativeGetPasswordManagerAutoSigninEnabled();
|
||||
@@ -1120,6 +1129,7 @@ public class PrefServiceBridge {
|
||||
@@ -1119,6 +1128,7 @@ public class PrefServiceBridge {
|
||||
private native void nativeSetAutoplayEnabled(boolean enabled);
|
||||
private native void nativeSetAllowCookiesEnabled(boolean enabled);
|
||||
private native void nativeSetBackgroundSyncEnabled(boolean enabled);
|
||||
@@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
|
||||
@@ -121,6 +121,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
@@ -124,6 +124,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
|
||||
// Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
|
||||
public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies";
|
||||
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
||||
public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
|
||||
public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
|
||||
private static final String ADD_EXCEPTION_KEY = "add_exception";
|
||||
@@ -441,6 +442,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
@@ -462,6 +463,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
|
||||
if (type == SiteSettingsCategory.Type.COOKIES) {
|
||||
updateThirdPartyCookiesCheckBox();
|
||||
@@ -101,7 +101,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
||||
} else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
|
||||
updateNotificationsVibrateCheckBox();
|
||||
}
|
||||
@@ -479,6 +481,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
@@ -500,6 +502,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
int setting = (int) newValue;
|
||||
prefServiceBridge.setContentSetting(mCategory.getContentSettingsType(), setting);
|
||||
getInfoForOrigins();
|
||||
@@ -110,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
||||
} else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
|
||||
prefServiceBridge.setBlockThirdPartyCookiesEnabled(((boolean) newValue));
|
||||
} else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) {
|
||||
@@ -768,6 +772,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
@@ -813,6 +817,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
TriStateSiteSettingsPreference triStateToggle =
|
||||
(TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
|
||||
Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
|
||||
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
||||
Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
|
||||
Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY);
|
||||
PreferenceGroup allowedGroup = (PreferenceGroup) screen.findPreference(ALLOWED_GROUP);
|
||||
@@ -798,6 +804,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
@@ -844,6 +850,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
|
||||
if (hideSecondaryToggles) {
|
||||
screen.removePreference(thirdPartyCookies);
|
||||
@@ -127,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
||||
screen.removePreference(notificationsVibrate);
|
||||
screen.removePreference(explainProtectedMediaKey);
|
||||
screen.removePreference(allowedGroup);
|
||||
@@ -807,12 +814,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
@@ -854,12 +861,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -144,7 +144,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
||||
}
|
||||
|
||||
// Configure/hide the notifications vibrate toggle, as needed.
|
||||
@@ -917,6 +927,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
@@ -966,6 +976,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
|
||||
preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
|
||||
}
|
||||
|
||||
@@ -163,7 +163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
||||
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
--- a/chrome/android/java/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
@@ -876,6 +876,12 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
@@ -927,6 +927,12 @@ Your Google account may have other forms of browsing history like searches and a
|
||||
<message name="IDS_BLOCK_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Block Third Party Cookies preference">
|
||||
Prevent third-party websites from saving and reading cookie data
|
||||
</message>
|
||||
@@ -179,7 +179,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
|
||||
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
|
||||
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
|
||||
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
|
||||
@@ -310,6 +310,17 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled(
|
||||
@@ -311,6 +311,17 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled(
|
||||
return GetPrefService()->GetBoolean(prefs::kBlockThirdPartyCookies);
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/
|
||||
static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesManaged(
|
||||
JNIEnv* env,
|
||||
const JavaParamRef<jobject>& obj) {
|
||||
@@ -767,6 +778,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
|
||||
@@ -768,6 +779,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
|
||||
GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,15 +14,15 @@ Fix build from scratch (issue found by nikolowry)
|
||||
chrome/browser/download/download_item_model.cc | 10 ++++++
|
||||
chrome/browser/download/download_item_model.h | 4 +++
|
||||
chrome/browser/download/download_prefs.cc | 4 +++
|
||||
.../browser/download/download_target_determiner.cc | 18 ++++++++++
|
||||
.../browser/download/download_target_determiner.cc | 22 ++++++++++++
|
||||
.../browser/download/download_target_determiner.h | 6 ++++
|
||||
chrome/browser/download/download_target_info.cc | 4 +++
|
||||
chrome/browser/download/download_target_info.h | 4 +++
|
||||
chrome/browser/download/download_ui_model.cc | 4 +++
|
||||
chrome/browser/download/download_ui_model.h | 4 +++
|
||||
.../chrome_resource_dispatcher_host_delegate.cc | 4 +++
|
||||
.../chrome_resource_dispatcher_host_delegate.cc | 2 ++
|
||||
chrome/browser/net/chrome_network_delegate.cc | 35 ++-----------------
|
||||
18 files changed, 85 insertions(+), 112 deletions(-)
|
||||
18 files changed, 87 insertions(+), 112 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
--- a/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
@@ -55,16 +55,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
|
||||
private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
|
||||
private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
|
||||
@@ -76,8 +73,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
@@ -79,8 +76,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
// Remove preferences that were migrated to SyncAndServicesPreferences.
|
||||
preferenceScreen.removePreference(findPreference(PREF_NAVIGATION_ERROR));
|
||||
preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS));
|
||||
- preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING_SCOUT_REPORTING));
|
||||
- preferenceScreen.removePreference(findPreference(PREF_SAFE_BROWSING));
|
||||
preferenceScreen.removePreference(findPreference(PREF_NETWORK_PREDICTIONS));
|
||||
preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
|
||||
preferenceScreen.removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING));
|
||||
@@ -118,17 +113,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
|
||||
@@ -114,17 +109,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
|
||||
}
|
||||
|
||||
@@ -79,10 +79,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
- safeBrowsingPref.setOnPreferenceChangeListener(this);
|
||||
- safeBrowsingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
|
||||
-
|
||||
if (BuildInfo.isAtLeastQ()) {
|
||||
ChromeBaseCheckBoxPreference usageStatsPref =
|
||||
(ChromeBaseCheckBoxPreference) findPreference(PREF_USAGE_STATS);
|
||||
@@ -146,11 +130,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
updateSummaries();
|
||||
}
|
||||
|
||||
@@ -133,11 +117,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
String key = preference.getKey();
|
||||
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
|
||||
@@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
|
||||
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
|
||||
recordNetworkPredictionEnablingUMA((boolean) newValue);
|
||||
@@ -202,19 +181,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
@@ -189,19 +168,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled());
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
CheckBoxPreference canMakePaymentPref =
|
||||
(CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
|
||||
if (canMakePaymentPref != null) {
|
||||
@@ -256,12 +222,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
@@ -250,12 +216,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
||||
return prefs.isSearchSuggestManaged();
|
||||
}
|
||||
@@ -130,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
||||
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
@@ -243,16 +243,6 @@ bool DoesOriginMatchEmbedderMask(int origin_type_mask,
|
||||
@@ -252,16 +252,6 @@ bool DoesOriginMatchEmbedderMask(int origin_type_mask,
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
|
||||
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -110,7 +110,6 @@
|
||||
@@ -118,7 +118,6 @@
|
||||
#include "chrome/browser/safe_browsing/certificate_reporting_service.h"
|
||||
#include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
|
||||
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
|
||||
@@ -158,7 +158,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
||||
#include "chrome/browser/safe_browsing/ui_manager.h"
|
||||
#include "chrome/browser/safe_browsing/url_checker_delegate_impl.h"
|
||||
@@ -4256,11 +4255,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
|
||||
@@ -4346,11 +4345,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
|
||||
PreviewsLitePageDecider::MaybeCreateThrottleFor(handle);
|
||||
if (previews_lite_page_throttle)
|
||||
throttles.push_back(std::move(previews_lite_page_throttle));
|
||||
@@ -170,7 +170,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
|
||||
#if defined(OS_WIN) || defined(OS_MACOSX) || \
|
||||
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
||||
@@ -5130,19 +5124,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
|
||||
@@ -5303,19 +5297,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
|
||||
content::ResourceContext* resource_context) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
||||
|
||||
@@ -207,7 +207,7 @@ diff --git a/chrome/browser/component_updater/file_type_policies_component_insta
|
||||
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -38,8 +38,10 @@
|
||||
@@ -39,8 +39,10 @@
|
||||
#include "chrome/browser/download/save_package_file_picker.h"
|
||||
#include "chrome/browser/platform_util.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
@@ -218,8 +218,8 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
|
||||
#include "chrome/browser/ui/browser.h"
|
||||
#include "chrome/browser/ui/browser_finder.h"
|
||||
#include "chrome/browser/ui/chrome_pages.h"
|
||||
@@ -49,7 +51,9 @@
|
||||
#include "chrome/common/chrome_features.h"
|
||||
@@ -51,7 +53,9 @@
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "chrome/common/pdf_util.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
+#if defined(FULL_SAFE_BROWSING)
|
||||
@@ -228,10 +228,10 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/download/public/common/download_interrupt_reasons.h"
|
||||
#include "components/download/public/common/download_item.h"
|
||||
@@ -101,8 +105,10 @@
|
||||
using content::BrowserThread;
|
||||
@@ -106,8 +110,10 @@ using content::DownloadManager;
|
||||
using download::DownloadItem;
|
||||
using content::DownloadManager;
|
||||
using download::DownloadPathReservationTracker;
|
||||
using download::PathValidationResult;
|
||||
+#if defined(FULL_SAFE_BROWSING)
|
||||
using safe_browsing::DownloadFileType;
|
||||
using safe_browsing::DownloadProtectionService;
|
||||
@@ -239,7 +239,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -764,19 +770,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() const {
|
||||
@@ -760,19 +766,19 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() const {
|
||||
return std::string(chrome::kApplicationClientIDStringForAVScanning);
|
||||
}
|
||||
|
||||
@@ -255,13 +255,13 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
|
||||
return sb_service->download_protection_service();
|
||||
}
|
||||
-#endif
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
+#endif
|
||||
|
||||
void ChromeDownloadManagerDelegate::NotifyExtensions(
|
||||
DownloadItem* download,
|
||||
@@ -1219,13 +1225,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
|
||||
@@ -1214,13 +1220,17 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
|
||||
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
|
||||
#endif
|
||||
|
||||
@@ -282,8 +282,8 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
|
||||
diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h
|
||||
--- a/chrome/browser/download/chrome_download_manager_delegate.h
|
||||
+++ b/chrome/browser/download/chrome_download_manager_delegate.h
|
||||
@@ -22,8 +22,10 @@
|
||||
#include "chrome/browser/download/download_path_reservation_tracker.h"
|
||||
@@ -21,8 +21,10 @@
|
||||
#include "build/build_config.h"
|
||||
#include "chrome/browser/download/download_target_determiner_delegate.h"
|
||||
#include "chrome/browser/download/download_target_info.h"
|
||||
+#if defined(FULL_SAFE_BROWSING)
|
||||
@@ -292,8 +292,8 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
|
||||
+#endif
|
||||
#include "components/download/public/common/download_danger_type.h"
|
||||
#include "components/download/public/common/download_item.h"
|
||||
#include "content/public/browser/download_manager_delegate.h"
|
||||
@@ -131,8 +133,10 @@ class ChromeDownloadManagerDelegate
|
||||
#include "components/download/public/common/download_path_reservation_tracker.h"
|
||||
@@ -134,8 +136,10 @@ class ChromeDownloadManagerDelegate
|
||||
DownloadPrefs* download_prefs() { return download_prefs_.get(); }
|
||||
|
||||
protected:
|
||||
@@ -304,7 +304,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome
|
||||
|
||||
// Show file picker for |download|.
|
||||
virtual void ShowFilePickerForDownload(
|
||||
@@ -197,9 +201,11 @@ class ChromeDownloadManagerDelegate
|
||||
@@ -201,9 +205,11 @@ class ChromeDownloadManagerDelegate
|
||||
const content::NotificationSource& source,
|
||||
const content::NotificationDetails& details) override;
|
||||
|
||||
@@ -430,7 +430,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download
|
||||
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -22,7 +22,9 @@
|
||||
@@ -23,7 +23,9 @@
|
||||
#include "chrome/browser/history/history_service_factory.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/common/pref_names.h"
|
||||
@@ -440,10 +440,10 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/download/public/common/download_interrupt_reasons.h"
|
||||
#include "components/history/core/browser/history_service.h"
|
||||
@@ -56,13 +58,16 @@
|
||||
|
||||
@@ -59,13 +61,16 @@
|
||||
using content::BrowserThread;
|
||||
using download::DownloadItem;
|
||||
using download::DownloadPathReservationTracker;
|
||||
+#if defined(FULL_SAFE_BROWSING)
|
||||
using safe_browsing::DownloadFileType;
|
||||
+#endif
|
||||
@@ -457,7 +457,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
// Condenses the results from HistoryService::GetVisibleVisitCountToHost() to a
|
||||
// single bool. A host is considered visited before if prior visible visits were
|
||||
// found in history and the first such visit was earlier than the most recent
|
||||
@@ -76,6 +81,7 @@ void VisitCountsToVisitedBefore(
|
||||
@@ -79,6 +84,7 @@ void VisitCountsToVisitedBefore(
|
||||
found_visits && count > 0 &&
|
||||
(first_visit.LocalMidnight() < base::Time::Now().LocalMidnight()));
|
||||
}
|
||||
@@ -465,7 +465,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
|
||||
#if defined(OS_WIN)
|
||||
// Keeps track of whether Adobe Reader is up to date.
|
||||
@@ -100,7 +106,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer(
|
||||
@@ -103,7 +109,9 @@ DownloadTargetDeterminer::DownloadTargetDeterminer(
|
||||
create_target_directory_(false),
|
||||
conflict_action_(conflict_action),
|
||||
danger_type_(download->GetDangerType()),
|
||||
@@ -475,7 +475,20 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
virtual_path_(initial_virtual_path),
|
||||
is_filetype_handled_safely_(false),
|
||||
#if defined(OS_ANDROID)
|
||||
@@ -719,6 +727,7 @@ DownloadTargetDeterminer::Result
|
||||
@@ -259,8 +267,12 @@ DownloadTargetDeterminer::Result
|
||||
// |suggested_filename| and Content-Disposition header have higher priority
|
||||
// than the URL.
|
||||
bool safe_file_ext =
|
||||
+#if defined(FULL_SAFE_BROWSING)
|
||||
!safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile(
|
||||
generated_filename);
|
||||
+#else
|
||||
+ true;
|
||||
+#endif
|
||||
net::HttpContentDisposition content_disposition_header(
|
||||
download_->GetContentDisposition(), referrer_charset);
|
||||
bool should_replace_extension =
|
||||
@@ -749,6 +761,7 @@ DownloadTargetDeterminer::Result
|
||||
return CONTINUE;
|
||||
}
|
||||
|
||||
@@ -483,7 +496,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
// First determine the danger level assuming that the user doesn't have any
|
||||
// prior visits to the referrer recoreded in history. The resulting danger
|
||||
// level would be ALLOW_ON_USER_GESTURE if the level depends on the visit
|
||||
@@ -755,6 +764,7 @@ DownloadTargetDeterminer::Result
|
||||
@@ -785,6 +798,7 @@ DownloadTargetDeterminer::Result
|
||||
// invalid, then assume the referrer has not been visited before.
|
||||
if (danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
|
||||
danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
|
||||
@@ -491,7 +504,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
return CONTINUE;
|
||||
}
|
||||
|
||||
@@ -762,11 +772,13 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
|
||||
@@ -792,11 +806,13 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
|
||||
bool visited_referrer_before) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
|
||||
@@ -505,7 +518,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
DoLoop();
|
||||
}
|
||||
|
||||
@@ -861,7 +873,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
|
||||
@@ -901,7 +917,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
|
||||
<< " Intermediate:" << intermediate_path_.AsUTF8Unsafe()
|
||||
<< " Confirmation reason:" << static_cast<int>(confirmation_reason_)
|
||||
<< " Danger type:" << danger_type_
|
||||
@@ -515,7 +528,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
<< " Result:" << static_cast<int>(result);
|
||||
std::unique_ptr<DownloadTargetInfo> target_info(new DownloadTargetInfo);
|
||||
|
||||
@@ -873,7 +887,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
|
||||
@@ -913,7 +931,9 @@ void DownloadTargetDeterminer::ScheduleCallbackAndDeleteSelf(
|
||||
? DownloadItem::TARGET_DISPOSITION_PROMPT
|
||||
: DownloadItem::TARGET_DISPOSITION_OVERWRITE);
|
||||
target_info->danger_type = danger_type_;
|
||||
@@ -525,7 +538,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
target_info->intermediate_path = intermediate_path_;
|
||||
target_info->mime_type = mime_type_;
|
||||
target_info->is_filetype_handled_safely = is_filetype_handled_safely_;
|
||||
@@ -959,6 +975,7 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const {
|
||||
@@ -999,6 +1019,7 @@ bool DownloadTargetDeterminer::HasPromptedForPath() const {
|
||||
DownloadItem::TARGET_DISPOSITION_PROMPT);
|
||||
}
|
||||
|
||||
@@ -533,7 +546,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
|
||||
PriorVisitsToReferrer visits) const {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
@@ -990,6 +1007,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
|
||||
@@ -1030,6 +1051,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
|
||||
|
||||
return DownloadFileType::NOT_DANGEROUS;
|
||||
}
|
||||
@@ -544,8 +557,8 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow
|
||||
diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h
|
||||
--- a/chrome/browser/download/download_target_determiner.h
|
||||
+++ b/chrome/browser/download/download_target_determiner.h
|
||||
@@ -17,7 +17,9 @@
|
||||
#include "chrome/browser/download/download_path_reservation_tracker.h"
|
||||
@@ -16,7 +16,9 @@
|
||||
#include "build/build_config.h"
|
||||
#include "chrome/browser/download/download_target_determiner_delegate.h"
|
||||
#include "chrome/browser/download/download_target_info.h"
|
||||
+#if defined(FULL_SAFE_BROWSING)
|
||||
@@ -553,8 +566,8 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows
|
||||
+#endif
|
||||
#include "components/download/public/common/download_danger_type.h"
|
||||
#include "components/download/public/common/download_item.h"
|
||||
#include "content/public/browser/download_manager_delegate.h"
|
||||
@@ -297,6 +299,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
|
||||
#include "components/download/public/common/download_path_reservation_tracker.h"
|
||||
@@ -300,6 +302,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
|
||||
// operation.
|
||||
bool HasPromptedForPath() const;
|
||||
|
||||
@@ -562,7 +575,7 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows
|
||||
// Returns true if this download should show the "dangerous file" warning.
|
||||
// Various factors are considered, such as the type of the file, whether a
|
||||
// user action initiated the download, and whether the user has explicitly
|
||||
@@ -306,6 +309,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
|
||||
@@ -309,6 +312,7 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
|
||||
// to true if the download requires explicit user consent.
|
||||
safe_browsing::DownloadFileType::DangerLevel GetDangerLevel(
|
||||
PriorVisitsToReferrer visits) const;
|
||||
@@ -570,9 +583,9 @@ diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/brows
|
||||
|
||||
// download::DownloadItem::Observer
|
||||
void OnDownloadDestroyed(download::DownloadItem* download) override;
|
||||
@@ -317,7 +321,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
|
||||
bool create_target_directory_;
|
||||
DownloadPathReservationTracker::FilenameConflictAction conflict_action_;
|
||||
@@ -321,7 +325,9 @@ class DownloadTargetDeterminer : public download::DownloadItem::Observer {
|
||||
download::DownloadPathReservationTracker::FilenameConflictAction
|
||||
conflict_action_;
|
||||
download::DownloadDangerType danger_type_;
|
||||
+#if defined(FULL_SAFE_BROWSING)
|
||||
safe_browsing::DownloadFileType::DangerLevel danger_level_;
|
||||
@@ -632,7 +645,7 @@ diff --git a/chrome/browser/download/download_target_info.h b/chrome/browser/dow
|
||||
diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/download/download_ui_model.cc
|
||||
--- a/chrome/browser/download/download_ui_model.cc
|
||||
+++ b/chrome/browser/download/download_ui_model.cc
|
||||
@@ -23,7 +23,9 @@
|
||||
@@ -25,7 +25,9 @@
|
||||
|
||||
using base::TimeDelta;
|
||||
using download::DownloadItem;
|
||||
@@ -642,7 +655,7 @@ diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/downl
|
||||
using offline_items_collection::FailState;
|
||||
|
||||
namespace {
|
||||
@@ -368,12 +370,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() const {
|
||||
@@ -389,12 +391,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() const {
|
||||
|
||||
void DownloadUIModel::SetShouldPreferOpeningInBrowser(bool preference) {}
|
||||
|
||||
@@ -689,7 +702,7 @@ diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/downlo
|
||||
diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
|
||||
--- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
|
||||
+++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
|
||||
@@ -400,14 +400,18 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
|
||||
@@ -399,7 +399,9 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
|
||||
content::ResourceContext* resource_context,
|
||||
ResourceType resource_type,
|
||||
std::vector<std::unique_ptr<content::ResourceThrottle>>* throttles) {
|
||||
@@ -697,17 +710,8 @@ diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b
|
||||
ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
|
||||
+#endif // defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
|
||||
|
||||
// Insert either safe browsing or data reduction proxy throttle at the front
|
||||
// of the list, so one of them gets to decide if the resource is safe.
|
||||
// Insert safe browsing to decide if the resource is safe.
|
||||
content::ResourceThrottle* first_throttle = NULL;
|
||||
#if defined(OS_ANDROID)
|
||||
+#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
|
||||
first_throttle = DataReductionProxyResourceThrottle::MaybeCreate(
|
||||
request, resource_context, resource_type, nullptr);
|
||||
+#endif
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
|
||||
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
|
||||
--- a/chrome/browser/net/chrome_network_delegate.cc
|
||||
+++ b/chrome/browser/net/chrome_network_delegate.cc
|
||||
@@ -731,7 +735,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
|
||||
bool IsAccessAllowedInternal(const base::FilePath& path,
|
||||
const base::FilePath& profile_path) {
|
||||
if (g_access_to_all_files_enabled)
|
||||
@@ -214,26 +201,8 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
|
||||
@@ -212,26 +199,8 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
|
||||
GURL* new_url) {
|
||||
extensions_delegate_->ForwardStartRequestStatus(request);
|
||||
|
||||
|
||||
@@ -3,14 +3,29 @@ Date: Thu, 2 Nov 2017 18:21:16 +0200
|
||||
Subject: Allow playing audio in background
|
||||
|
||||
---
|
||||
media/blink/webmediaplayer_impl.cc | 11 ++++++++++-
|
||||
chrome/browser/about_flags.cc | 4 ++++
|
||||
media/blink/webmediaplayer_impl.cc | 12 +++++++++++-
|
||||
media/blink/webmediaplayer_impl.h | 2 ++
|
||||
2 files changed, 12 insertions(+), 1 deletion(-)
|
||||
3 files changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -1400,6 +1400,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"debug-packed-apps", flag_descriptions::kDebugPackedAppName,
|
||||
flag_descriptions::kDebugPackedAppDescription, kOsDesktop,
|
||||
SINGLE_VALUE_TYPE(switches::kDebugPackedApps)},
|
||||
+ {"resume-background-video",
|
||||
+ flag_descriptions::kResumeBackgroundVideoName,
|
||||
+ flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
|
||||
+ FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
|
||||
{"automatic-password-generation",
|
||||
flag_descriptions::kAutomaticPasswordGenerationName,
|
||||
flag_descriptions::kAutomaticPasswordGenerationDescription, kOsAll,
|
||||
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
|
||||
--- a/media/blink/webmediaplayer_impl.cc
|
||||
+++ b/media/blink/webmediaplayer_impl.cc
|
||||
@@ -1014,6 +1014,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
|
||||
@@ -961,6 +961,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
|
||||
return pipeline_metadata_.has_audio;
|
||||
}
|
||||
|
||||
@@ -23,22 +38,23 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
|
||||
void WebMediaPlayerImpl::EnabledAudioTracksChanged(
|
||||
const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
|
||||
DCHECK(main_task_runner_->BelongsToCurrentThread());
|
||||
@@ -3297,7 +3303,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
|
||||
// If suspending background video, pause any video that's not remoted or
|
||||
// not unlocked to play in the background.
|
||||
if (IsBackgroundSuspendEnabled(this)) {
|
||||
- if (!HasVideo())
|
||||
+ //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
|
||||
+ //see media/base/pipeline_metadata.h. This is a workaround to allow audio
|
||||
+ //streams be played in background.
|
||||
+ if (!HasVideoNonEmptySize())
|
||||
return false;
|
||||
@@ -3205,7 +3211,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
|
||||
// Audio only stream is allowed to play when in background.
|
||||
// TODO: We should check IsBackgroundOptimizationCandidate here. But we need
|
||||
// to move the logic of checking video frames out of that function.
|
||||
- if (!HasVideo())
|
||||
+
|
||||
+ //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
|
||||
+ //see media/base/pipeline_metadata.h. This is a workaround to allow audio
|
||||
+ //streams be played in background.
|
||||
+ if (!HasVideoNonEmptySize())
|
||||
return false;
|
||||
|
||||
#if defined(OS_ANDROID)
|
||||
if (!is_background_video_playback_enabled_)
|
||||
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
|
||||
--- a/media/blink/webmediaplayer_impl.h
|
||||
+++ b/media/blink/webmediaplayer_impl.h
|
||||
@@ -153,6 +153,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
|
||||
@@ -142,6 +142,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
|
||||
// True if the loaded media has a playable video/audio track.
|
||||
bool HasVideo() const override;
|
||||
bool HasAudio() const override;
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Always allow partner customisation
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
|
||||
@@ -242,14 +242,14 @@ public class PartnerBrowserCustomizations {
|
||||
@@ -244,14 +244,14 @@ public class PartnerBrowserCustomizations {
|
||||
@Override
|
||||
protected Void doInBackground() {
|
||||
try {
|
||||
|
||||
@@ -11,7 +11,7 @@ Do not read experiment value for cronet async DNS configuration
|
||||
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
|
||||
--- a/chrome/browser/net/system_network_context_manager.cc
|
||||
+++ b/chrome/browser/net/system_network_context_manager.cc
|
||||
@@ -220,7 +220,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
|
||||
@@ -228,7 +228,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
|
||||
// Android this includes checking the Android version in the field trial.
|
||||
bool ShouldEnableAsyncDns() {
|
||||
bool feature_can_be_enabled = true;
|
||||
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
|
||||
diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
|
||||
--- a/components/cronet/url_request_context_config.cc
|
||||
+++ b/components/cronet/url_request_context_config.cc
|
||||
@@ -517,7 +517,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
|
||||
@@ -544,7 +544,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
|
||||
effective_experimental_options->Remove(it.key(), nullptr);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -7,19 +7,19 @@ display home page settings.
|
||||
This allows removing the home page button and restoring it from settings.
|
||||
---
|
||||
.../browser/init/ProcessInitializationHandler.java | 12 --------
|
||||
.../partnercustomizations/HomepageManager.java | 17 ++--------
|
||||
.../partnercustomizations/HomepageManager.java | 17 ++---------
|
||||
.../preferences/ChromePreferenceManager.java | 7 -----
|
||||
.../browser/preferences/MainPreferences.java | 12 +++-----
|
||||
.../chrome/browser/util/FeatureUtilities.java | 36 ----------------------
|
||||
.../chrome/browser/util/FeatureUtilities.java | 34 ----------------------
|
||||
chrome/browser/about_flags.cc | 3 --
|
||||
chrome/browser/android/chrome_feature_list.cc | 4 ---
|
||||
chrome/browser/android/chrome_feature_list.h | 1 -
|
||||
8 files changed, 7 insertions(+), 85 deletions(-)
|
||||
8 files changed, 7 insertions(+), 83 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
|
||||
@@ -328,18 +328,6 @@ public class ProcessInitializationHandler {
|
||||
@@ -338,18 +338,6 @@ public class ProcessInitializationHandler {
|
||||
deferredStartupHandler.addDeferredTask(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
@@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
|
||||
@@ -144,13 +144,6 @@ public class ChromePreferenceManager {
|
||||
@@ -147,13 +147,6 @@ public class ChromePreferenceManager {
|
||||
private static final String CHROME_MODERN_DESIGN_ENABLED_KEY = "chrome_modern_design_enabled";
|
||||
|
||||
/**
|
||||
@@ -106,8 +106,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Chr
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
|
||||
@@ -195,15 +195,11 @@ public class MainPreferences extends PreferenceFragment
|
||||
|
||||
@@ -208,15 +208,11 @@ public class MainPreferences extends PreferenceFragment
|
||||
updateSyncAndServicesPreference();
|
||||
updateSearchEnginePreference();
|
||||
|
||||
- if (HomepageManager.shouldShowHomepageSetting()) {
|
||||
@@ -129,7 +129,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
|
||||
@@ -71,7 +71,6 @@ public class FeatureUtilities {
|
||||
@@ -74,7 +74,6 @@ public class FeatureUtilities {
|
||||
private static Boolean sHasRecognitionIntentHandler;
|
||||
|
||||
private static Boolean sIsSoleEnabled;
|
||||
@@ -137,7 +137,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti
|
||||
private static Boolean sIsHomepageTileEnabled;
|
||||
private static Boolean sIsNewTabPageButtonEnabled;
|
||||
private static Boolean sIsBottomToolbarEnabled;
|
||||
@@ -186,7 +185,6 @@ public class FeatureUtilities {
|
||||
@@ -196,7 +195,6 @@ public class FeatureUtilities {
|
||||
cacheSoleEnabled();
|
||||
cacheCommandLineOnNonRootedEnabled();
|
||||
FirstRunUtils.cacheFirstRunPrefs();
|
||||
@@ -145,10 +145,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti
|
||||
cacheHomepageTileEnabled();
|
||||
cacheNewTabPageButtonEnabled();
|
||||
cacheBottomToolbarEnabled();
|
||||
@@ -212,40 +210,6 @@ public class FeatureUtilities {
|
||||
@@ -232,38 +230,6 @@ public class FeatureUtilities {
|
||||
return Build.VERSION.SDK_INT > Build.VERSION_CODES.M;
|
||||
}
|
||||
|
||||
/**
|
||||
- /**
|
||||
- * Cache whether or not the home page button is force enabled so on next startup, the value can
|
||||
- * be made available immediately.
|
||||
- */
|
||||
@@ -166,10 +167,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti
|
||||
- if (sIsHomePageButtonForceEnabled == null) {
|
||||
- ChromePreferenceManager prefManager = ChromePreferenceManager.getInstance();
|
||||
-
|
||||
- try (StrictModeContext unused = StrictModeContext.allowDiskReads()) {
|
||||
- sIsHomePageButtonForceEnabled = prefManager.readBoolean(
|
||||
- ChromePreferenceManager.HOME_PAGE_BUTTON_FORCE_ENABLED_KEY, false);
|
||||
- }
|
||||
- sIsHomePageButtonForceEnabled = prefManager.readBoolean(
|
||||
- ChromePreferenceManager.HOME_PAGE_BUTTON_FORCE_ENABLED_KEY, false);
|
||||
- }
|
||||
- return sIsHomePageButtonForceEnabled;
|
||||
- }
|
||||
@@ -182,14 +181,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti
|
||||
- sIsHomePageButtonForceEnabled = null;
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
* Cache whether or not the toolbar should be inflated on a background thread so on next
|
||||
* startup, the value can be made available immediately.
|
||||
*/
|
||||
private static void cacheServiceManagerForBackgroundPrefetch() {
|
||||
boolean backgroundPrefetchInReducedMode = ChromeFeatureList.isEnabled(
|
||||
ChromeFeatureList.SERVICE_MANAGER_FOR_BACKGROUND_PREFETCH);
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -1891,9 +1891,6 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -1576,9 +1576,6 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-chrome-duet", flag_descriptions::kChromeDuetName,
|
||||
flag_descriptions::kChromeDuetDescription, kOsAndroid,
|
||||
FEATURE_VALUE_TYPE(chrome::android::kChromeDuetFeature)},
|
||||
@@ -202,15 +200,15 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
|
||||
--- a/chrome/browser/android/chrome_feature_list.cc
|
||||
+++ b/chrome/browser/android/chrome_feature_list.cc
|
||||
@@ -124,7 +124,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
|
||||
&kGestureNavigation,
|
||||
@@ -140,7 +140,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
|
||||
&kExploreSites,
|
||||
&kHandleMediaIntents,
|
||||
&kHideUserDataFromIncognitoNotifications,
|
||||
- &kHomePageButtonForceEnabled,
|
||||
&kHomepageTile,
|
||||
&kHorizontalTabSwitcherAndroid,
|
||||
&kImprovedA2HS,
|
||||
@@ -337,9 +336,6 @@ const base::Feature kHandleMediaIntents{"HandleMediaIntents",
|
||||
&kImmersiveUiMode,
|
||||
@@ -405,9 +404,6 @@ const base::Feature kHandleMediaIntents{"HandleMediaIntents",
|
||||
const base::Feature kHideUserDataFromIncognitoNotifications{
|
||||
"HideUserDataFromIncognitoNotifications", base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
|
||||
@@ -223,14 +221,14 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr
|
||||
diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h
|
||||
--- a/chrome/browser/android/chrome_feature_list.h
|
||||
+++ b/chrome/browser/android/chrome_feature_list.h
|
||||
@@ -56,7 +56,6 @@ extern const base::Feature kForegroundNotificationManager;
|
||||
extern const base::Feature kGestureNavigation;
|
||||
@@ -70,7 +70,6 @@ extern const base::Feature kExploreSites;
|
||||
extern const base::Feature kForegroundNotificationManager;
|
||||
extern const base::Feature kHandleMediaIntents;
|
||||
extern const base::Feature kHideUserDataFromIncognitoNotifications;
|
||||
-extern const base::Feature kHomePageButtonForceEnabled;
|
||||
extern const base::Feature kHomepageTile;
|
||||
extern const base::Feature kHorizontalTabSwitcherAndroid;
|
||||
extern const base::Feature kImprovedA2HS;
|
||||
extern const base::Feature kImmersiveUiMode;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -43,14 +43,14 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir
|
||||
diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
|
||||
--- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
|
||||
+++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
|
||||
@@ -315,6 +315,7 @@ void AudioContext::StopRendering() {
|
||||
@@ -333,6 +333,7 @@ void AudioContext::StopRendering() {
|
||||
double AudioContext::baseLatency() const {
|
||||
DCHECK(IsMainThread());
|
||||
DCHECK(destination());
|
||||
+ return 0.04;
|
||||
|
||||
// TODO(hongchan): Due to the incompatible constructor between
|
||||
// AudioDestinationNode and DefaultAudioDestinationNode, casting directly from
|
||||
// AudioDestinationNode and RealtimeAudioDestinationNode, casting directly
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Battery API: return nothing
|
||||
diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
|
||||
--- a/third_party/blink/renderer/modules/battery/battery_manager.cc
|
||||
+++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
|
||||
@@ -43,45 +43,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
|
||||
@@ -44,45 +44,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
|
||||
}
|
||||
|
||||
bool BatteryManager::charging() {
|
||||
|
||||
@@ -33,7 +33,7 @@ Add support for Webview content blocking
|
||||
diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webview/browser/net/aw_network_delegate.cc
|
||||
--- a/android_webview/browser/net/aw_network_delegate.cc
|
||||
+++ b/android_webview/browser/net/aw_network_delegate.cc
|
||||
@@ -19,9 +19,11 @@
|
||||
@@ -20,9 +20,11 @@
|
||||
#include "net/base/proxy_server.h"
|
||||
#include "net/http/http_response_headers.h"
|
||||
#include "net/proxy_resolution/proxy_info.h"
|
||||
@@ -45,7 +45,7 @@ diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webvie
|
||||
|
||||
namespace android_webview {
|
||||
|
||||
@@ -48,6 +50,72 @@ AwNetworkDelegate::AwNetworkDelegate() {}
|
||||
@@ -49,6 +51,72 @@ AwNetworkDelegate::AwNetworkDelegate() {}
|
||||
AwNetworkDelegate::~AwNetworkDelegate() {
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webvie
|
||||
+ isValidUrl = false;
|
||||
+ }
|
||||
+ }
|
||||
+ const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
|
||||
+ ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
|
||||
+
|
||||
+ // there are no per-site nor global ad/content settings when using the SystemWebView
|
||||
+ bool adblock_enabled = true;
|
||||
@@ -72,7 +72,7 @@ diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webvie
|
||||
+ auto resource_type = info->GetResourceType();
|
||||
+
|
||||
+ if (adblock_enabled
|
||||
+ && content::RESOURCE_TYPE_MAIN_FRAME != resource_type
|
||||
+ && content::ResourceType::kMainFrame != resource_type
|
||||
+ && net::adblock_intercept(request->url(),
|
||||
+ request->initiator()->host(),
|
||||
+ resource_type)) {
|
||||
@@ -81,14 +81,14 @@ diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webvie
|
||||
+
|
||||
+ if (block) {
|
||||
+ switch (resource_type) {
|
||||
+ case content::RESOURCE_TYPE_IMAGE:
|
||||
+ case content::RESOURCE_TYPE_FAVICON:
|
||||
+ case content::ResourceType::kImage:
|
||||
+ case content::ResourceType::kFavicon:
|
||||
+ *new_url = GURL(TRANSPARENT1PXGIF);
|
||||
+ break;
|
||||
+ case content::RESOURCE_TYPE_SCRIPT:
|
||||
+ case content::ResourceType::kScript:
|
||||
+ *new_url = GURL(EMPTYJS);
|
||||
+ break;
|
||||
+ case content::RESOURCE_TYPE_STYLESHEET:
|
||||
+ case content::ResourceType::kStylesheet:
|
||||
+ *new_url = GURL(EMPTYCSS);
|
||||
+ break;
|
||||
+ default:
|
||||
@@ -177,7 +177,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
@@ -2249,6 +2249,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
@@ -2263,6 +2263,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
RecordUserAction.record("MobileMenuRequestEnableJavascript");
|
||||
} else if (id == R.id.reader_mode_prefs_id) {
|
||||
DomDistillerUIUtils.openSettings(currentTab.getWebContents());
|
||||
@@ -195,7 +195,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -1678,6 +1678,14 @@ public class ChromeTabbedActivity
|
||||
@@ -1776,6 +1776,14 @@ public class ChromeTabbedActivity
|
||||
reportNewTabShortcutUsed(true);
|
||||
getTabCreator(true).launchNTP();
|
||||
}
|
||||
@@ -213,7 +213,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
|
||||
@@ -196,6 +196,8 @@ public class AppMenuPropertiesDelegate {
|
||||
@@ -195,6 +195,8 @@ public class AppMenuPropertiesDelegate {
|
||||
&& !TextUtils.isEmpty(url);
|
||||
prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
|
||||
|
||||
@@ -280,7 +280,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
|
||||
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
--- a/chrome/android/java/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
@@ -3059,6 +3059,17 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
@@ -3147,6 +3147,17 @@ To change this setting, <ph name="BEGIN_LINK"><resetlink></ph>reset sync<p
|
||||
<message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
|
||||
Turn on Request desktop site
|
||||
</message>
|
||||
@@ -317,7 +317,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
|
||||
#endif
|
||||
|
||||
#if defined(OS_CHROMEOS)
|
||||
@@ -195,10 +197,91 @@ void ChromeNetworkDelegate::set_cookie_settings(
|
||||
@@ -193,10 +195,91 @@ void ChromeNetworkDelegate::set_cookie_settings(
|
||||
cookie_settings_ = cookie_settings;
|
||||
}
|
||||
|
||||
@@ -336,7 +336,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
|
||||
+ isValidUrl = false;
|
||||
+ }
|
||||
+ }
|
||||
+ const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
|
||||
+ ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
|
||||
+
|
||||
+ bool adblock_enabled = false;
|
||||
+ if (isValidUrl && info) {
|
||||
@@ -362,7 +362,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
|
||||
+ auto resource_type = info->GetResourceType();
|
||||
+
|
||||
+ if (adblock_enabled
|
||||
+ && content::RESOURCE_TYPE_MAIN_FRAME != resource_type
|
||||
+ && content::ResourceType::kMainFrame != resource_type
|
||||
+ && net::adblock_intercept(request->url(),
|
||||
+ request->initiator()->host(),
|
||||
+ resource_type)) {
|
||||
@@ -371,14 +371,14 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
|
||||
+
|
||||
+ if (block) {
|
||||
+ switch (resource_type) {
|
||||
+ case content::RESOURCE_TYPE_IMAGE:
|
||||
+ case content::RESOURCE_TYPE_FAVICON:
|
||||
+ case content::ResourceType::kImage:
|
||||
+ case content::ResourceType::kFavicon:
|
||||
+ *new_url = GURL(TRANSPARENT1PXGIF);
|
||||
+ break;
|
||||
+ case content::RESOURCE_TYPE_SCRIPT:
|
||||
+ case content::ResourceType::kScript:
|
||||
+ *new_url = GURL(EMPTYJS);
|
||||
+ break;
|
||||
+ case content::RESOURCE_TYPE_STYLESHEET:
|
||||
+ case content::ResourceType::kStylesheet:
|
||||
+ *new_url = GURL(EMPTYCSS);
|
||||
+ break;
|
||||
+ default:
|
||||
@@ -436,7 +436,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn
|
||||
+
|
||||
if (enable_reporting) {
|
||||
sources += [
|
||||
"network_error_logging/network_error_logging_delegate.cc",
|
||||
"network_error_logging/network_error_logging_service.cc",
|
||||
diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_intercept.cc
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
@@ -728,7 +728,7 @@ new file mode 100644
|
||||
+ }
|
||||
+
|
||||
+ // use a bitwise trick to test for the current resource type
|
||||
+ bool found = (entry->flags & (resource_type << 16));
|
||||
+ bool found = (entry->flags & (int(resource_type) << 16));
|
||||
+ if (!exclude)
|
||||
+ return found;
|
||||
+ return !found;
|
||||
|
||||
@@ -30,7 +30,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
|
||||
#include "third_party/blink/public/common/features.h"
|
||||
#include "third_party/blink/public/platform/platform.h"
|
||||
#include "third_party/blink/public/platform/task_type.h"
|
||||
@@ -790,7 +788,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
|
||||
@@ -799,7 +797,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
|
||||
GetState().GetTextAlign(), text);
|
||||
|
||||
// scale text metrics by 3/1000000th
|
||||
@@ -59,7 +59,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.
|
||||
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
|
||||
--- a/third_party/blink/renderer/platform/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/platform/BUILD.gn
|
||||
@@ -1432,7 +1432,9 @@ jumbo_component("platform") {
|
||||
@@ -1435,7 +1435,9 @@ jumbo_component("platform") {
|
||||
"//third_party/blink/renderer:non_test_config",
|
||||
]
|
||||
|
||||
@@ -82,7 +82,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
|
||||
#include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
|
||||
#include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
|
||||
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
|
||||
@@ -128,6 +130,9 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type,
|
||||
@@ -127,6 +129,9 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type,
|
||||
const SkPixmap& pixmap) const {
|
||||
DCHECK(is_valid_);
|
||||
|
||||
@@ -111,8 +111,8 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
|
||||
+#include "third_party/skia/include/private/SkColorData.h"
|
||||
#include "third_party/skia/include/core/SkSurface.h"
|
||||
#include "third_party/skia/include/gpu/GrContext.h"
|
||||
|
||||
@@ -171,10 +174,163 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
|
||||
#include "v8/include/v8.h"
|
||||
@@ -152,10 +155,163 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
|
||||
DCHECK(read_pixels_successful ||
|
||||
!sk_image->bounds().intersect(SkIRect::MakeXYWH(
|
||||
rect.X(), rect.Y(), info.width(), info.height())));
|
||||
|
||||
@@ -3,29 +3,30 @@ Date: Thu, 12 Oct 2017 08:15:17 +0200
|
||||
Subject: Disable NTP remote suggestions by default
|
||||
|
||||
---
|
||||
components/ntp_snippets/features.cc | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
components/ntp_snippets/features.cc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
|
||||
--- a/components/ntp_snippets/features.cc
|
||||
+++ b/components/ntp_snippets/features.cc
|
||||
@@ -35,13 +35,13 @@ const base::Feature* const kAllFeatures[] = {
|
||||
@@ -41,7 +41,7 @@ const base::Feature* const kAllFeatures[] = {
|
||||
&kRemoteSuggestionsBackendFeature};
|
||||
|
||||
const base::Feature kArticleSuggestionsFeature{
|
||||
- "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
+ "NTPArticleSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
|
||||
const base::Feature kBookmarkSuggestionsFeature{
|
||||
- "NTPBookmarkSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
+ "NTPBookmarkSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
const base::Feature kRemoteSuggestionsEmulateM58FetchingSchedule{
|
||||
"RemoteSuggestionsEmulateM58FetchingSchedule",
|
||||
@@ -71,7 +71,7 @@ const char kNotificationsDailyLimit[] = "daily_limit";
|
||||
const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
|
||||
|
||||
const base::Feature kIncreasedVisibility{"NTPSnippetsIncreasedVisibility",
|
||||
- base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
+ base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
const base::Feature kKeepPrefetchedContentSuggestions{
|
||||
- "KeepPrefetchedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
+ "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
|
||||
const base::Feature kBreakingNewsPushFeature{"BreakingNewsPush",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
const base::Feature kContentSuggestionsDebugLog{
|
||||
"ContentSuggestionsDebugLog", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNu
|
||||
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
|
||||
--- a/chrome/browser/android/chrome_feature_list.cc
|
||||
+++ b/chrome/browser/android/chrome_feature_list.cc
|
||||
@@ -357,7 +357,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
|
||||
@@ -428,7 +428,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
|
||||
base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
|
||||
const base::Feature kJellyBeanSupported{"JellyBeanSupported",
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Disable WebRTC by default
|
||||
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
|
||||
--- a/chrome/browser/ui/browser_ui_prefs.cc
|
||||
+++ b/chrome/browser/ui/browser_ui_prefs.cc
|
||||
@@ -85,10 +85,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
@@ -82,10 +82,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
false);
|
||||
#endif
|
||||
// TODO(guoweis): Remove next 2 options at M50.
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Disable contextual search by default
|
||||
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
|
||||
--- a/chrome/browser/profiles/profile.cc
|
||||
+++ b/chrome/browser/profiles/profile.cc
|
||||
@@ -143,7 +143,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
@@ -153,7 +153,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
#if defined(OS_ANDROID)
|
||||
registry->RegisterStringPref(
|
||||
prefs::kContextualSearchEnabled,
|
||||
|
||||
@@ -3,53 +3,42 @@ Date: Fri, 27 Oct 2017 15:53:37 +0200
|
||||
Subject: Disable data saver
|
||||
|
||||
---
|
||||
.../java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java | 1 -
|
||||
.../chrome/browser/net/spdyproxy/DataReductionProxySettings.java | 2 ++
|
||||
.../browser/preferences/datareduction/DataReductionPromoUtils.java | 2 +-
|
||||
3 files changed, 3 insertions(+), 2 deletions(-)
|
||||
.../datareduction/DataReductionPreferenceFragment.java | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
||||
@@ -141,7 +141,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
|
||||
boolean notifyAdapter = false;
|
||||
// An optional Data Saver page.
|
||||
if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
|
||||
- mPages.add(new DataReductionProxyFirstRunFragment.Page());
|
||||
mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
|
||||
notifyAdapter = true;
|
||||
}
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
|
||||
@@ -126,6 +126,7 @@ public class DataReductionProxySettings {
|
||||
// DataReductionProxySettings is a singleton that lives forever and there's no clean
|
||||
// shutdown of Chrome on Android
|
||||
mNativeDataReductionProxySettings = nativeInit();
|
||||
+ nativeSetDataReductionProxyEnabled(mNativeDataReductionProxySettings, false);
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java
|
||||
@@ -50,10 +50,10 @@ public class DataReductionPreferenceFragment extends PreferenceFragment {
|
||||
PreferenceUtils.addPreferencesFromResource(this, R.xml.data_reduction_preferences);
|
||||
getActivity().setTitle(DataReductionBrandingResourceProvider.getDataSaverBrandedString(
|
||||
R.string.data_reduction_title));
|
||||
- boolean isEnabled = DataReductionProxySettings.getInstance().isDataReductionProxyEnabled();
|
||||
- mIsEnabled = !isEnabled;
|
||||
- mWasEnabledAtCreation = isEnabled;
|
||||
- updatePreferences(isEnabled);
|
||||
+
|
||||
+ mIsEnabled = false;
|
||||
+ mWasEnabledAtCreation = false;
|
||||
+ updatePreferences(false);
|
||||
|
||||
setHasOptionsMenu(true);
|
||||
|
||||
@@ -153,6 +153,7 @@ public class DataReductionPreferenceFragment extends PreferenceFragment {
|
||||
}
|
||||
|
||||
/** Returns true if the SPDY proxy promo is allowed to be shown. */
|
||||
@@ -148,6 +149,7 @@ public class DataReductionProxySettings {
|
||||
* data reduction statistics if this is the first time the SPDY proxy has been enabled.
|
||||
*/
|
||||
public void setDataReductionProxyEnabled(Context context, boolean enabled) {
|
||||
+ enabled = false;
|
||||
if (enabled
|
||||
&& ContextUtils.getAppSharedPreferences().getLong(
|
||||
DATA_REDUCTION_FIRST_ENABLED_TIME, 0)
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
|
||||
@@ -68,7 +68,7 @@ public class DataReductionPromoUtils {
|
||||
}
|
||||
if (DataReductionProxySettings.getInstance().isDataReductionProxyManaged()) return false;
|
||||
if (DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) return false;
|
||||
- return true;
|
||||
+ return false;
|
||||
private void createDataReductionSwitch(boolean isEnabled) {
|
||||
+ if (false) {
|
||||
final ChromeSwitchPreference dataReductionSwitch =
|
||||
new ChromeSwitchPreference(getActivity(), null);
|
||||
dataReductionSwitch.setKey(PREF_DATA_REDUCTION_SWITCH);
|
||||
@@ -180,5 +181,6 @@ public class DataReductionPreferenceFragment extends PreferenceFragment {
|
||||
// (e.g. the switch will say "On" when data reduction is really turned off), so
|
||||
// .setChecked() should be called after .addPreference()
|
||||
dataReductionSwitch.setChecked(isEnabled);
|
||||
+ }
|
||||
}
|
||||
|
||||
/**
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -0,0 +1,210 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Mon, 20 May 2019 23:14:36 +0200
|
||||
Subject: Disable dynamic module loading
|
||||
|
||||
---
|
||||
chrome/android/chrome_java_sources.gni | 13 ----------
|
||||
.../browser/customtabs/CustomTabActivity.java | 18 -------------
|
||||
.../customtabs/CustomTabIntentDataProvider.java | 17 ++----------
|
||||
.../browser/customtabs/CustomTabsConnection.java | 30 ----------------------
|
||||
.../CustomTabActivityComponent.java | 4 ---
|
||||
5 files changed, 2 insertions(+), 80 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -479,19 +479,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/customtabs/content/TabCreationMode.java",
|
||||
"java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java",
|
||||
"java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityModule.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ActivityDelegate.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ActivityDelegatePostMessageBackend.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ActivityHostImpl.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleConstants.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleCoordinator.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleNavigationEventObserver.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModulePageLoadObserver.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleToolbarController.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleEntryPoint.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleHostImpl.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleLoader.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleMetrics.java",
|
||||
- "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ObjectWrapper.java",
|
||||
"java/src/org/chromium/chrome/browser/database/SQLiteCursor.java",
|
||||
"java/src/org/chromium/chrome/browser/datareduction/DataReductionBrandingResourceProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/datareduction/DataReductionMainMenuItem.java",
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
@@ -62,7 +62,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvid
|
||||
import org.chromium.chrome.browser.customtabs.content.TabCreationMode;
|
||||
import org.chromium.chrome.browser.customtabs.dependency_injection.CustomTabActivityComponent;
|
||||
import org.chromium.chrome.browser.customtabs.dependency_injection.CustomTabActivityModule;
|
||||
-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleCoordinator;
|
||||
import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
|
||||
import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
|
||||
import org.chromium.chrome.browser.gsa.GSAState;
|
||||
@@ -133,9 +132,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
|
||||
|
||||
private final CustomTabsConnection mConnection = CustomTabsConnection.getInstance();
|
||||
|
||||
- @Nullable
|
||||
- private DynamicModuleCoordinator mDynamicModuleCoordinator;
|
||||
-
|
||||
private ActivityTabTaskDescriptionHelper mTaskDescriptionHelper;
|
||||
|
||||
private CustomTabNightModeStateController mNightModeStateController;
|
||||
@@ -315,12 +311,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
|
||||
public void finishNativeInitialization() {
|
||||
if (!mIntentDataProvider.isInfoPage()) FirstRunSignInProcessor.start(this);
|
||||
|
||||
- // Try to initialize dynamic module early to enqueue navigation events
|
||||
- // @see DynamicModuleNavigationEventObserver
|
||||
- if (mIntentDataProvider.isDynamicModuleEnabled()) {
|
||||
- mDynamicModuleCoordinator = getComponent().resolveDynamicModuleCoordinator();
|
||||
- }
|
||||
-
|
||||
LayoutManager layoutDriver = new LayoutManager(getCompositorViewHolder());
|
||||
initializeCompositorContent(layoutDriver, findViewById(R.id.url_bar),
|
||||
(ViewGroup) findViewById(android.R.id.content),
|
||||
@@ -461,10 +451,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
|
||||
WebContents webContents = tab == null ? null : tab.getWebContents();
|
||||
mConnection.resetPostMessageHandlerForSession(
|
||||
mIntentDataProvider.getSession(), webContents);
|
||||
-
|
||||
- if (mDynamicModuleCoordinator != null) {
|
||||
- mDynamicModuleCoordinator.resetPostMessageHandlersForCurrentSession(null);
|
||||
- }
|
||||
}
|
||||
|
||||
private void initalizePreviewsObserver() {
|
||||
@@ -926,10 +912,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
|
||||
if (mIntentDataProvider.isTrustedWebActivity()) {
|
||||
component.resolveTrustedWebActivityCoordinator();
|
||||
}
|
||||
- if (mConnection.shouldHideTopBarOnModuleManagedUrlsForSession(
|
||||
- mIntentDataProvider.getSession())) {
|
||||
- component.resolveDynamicModuleToolbarController();
|
||||
- }
|
||||
|
||||
return component;
|
||||
}
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
|
||||
@@ -38,7 +38,6 @@ import org.chromium.chrome.browser.ChromeVersionInfo;
|
||||
import org.chromium.chrome.browser.IntentHandler;
|
||||
import org.chromium.chrome.browser.UrlConstants;
|
||||
import org.chromium.chrome.browser.browserservices.BrowserSessionDataProvider;
|
||||
-import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleMetrics;
|
||||
import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
|
||||
import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
|
||||
import org.chromium.chrome.browser.util.ColorUtils;
|
||||
@@ -826,20 +825,8 @@ public class CustomTabIntentDataProvider extends BrowserSessionDataProvider {
|
||||
// even receive the extras for using the feature.
|
||||
if (componentName == null) return false;
|
||||
|
||||
- if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CCT_MODULE)) {
|
||||
- Log.w(TAG, "The %s feature is disabled.", ChromeFeatureList.CCT_MODULE);
|
||||
- ModuleMetrics.recordLoadResult(ModuleMetrics.LoadResult.FEATURE_DISABLED);
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- ExternalAuthUtils authUtils = ChromeApplication.getComponent().resolveExternalAuthUtils();
|
||||
- if (!authUtils.isGoogleSigned(componentName.getPackageName())) {
|
||||
- Log.w(TAG, "The %s package is not Google-signed.", componentName.getPackageName());
|
||||
- ModuleMetrics.recordLoadResult(ModuleMetrics.LoadResult.NOT_GOOGLE_SIGNED);
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- return true;
|
||||
+ Log.w(TAG, "The %s feature is disabled.", ChromeFeatureList.CCT_MODULE);
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
|
||||
@@ -57,8 +57,6 @@ import org.chromium.chrome.browser.WarmupManager;
|
||||
import org.chromium.chrome.browser.browserservices.BrowserSessionContentUtils;
|
||||
import org.chromium.chrome.browser.browserservices.Origin;
|
||||
import org.chromium.chrome.browser.browserservices.PostMessageHandler;
|
||||
-import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleLoader;
|
||||
-import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleMetrics;
|
||||
import org.chromium.chrome.browser.device.DeviceClassManager;
|
||||
import org.chromium.chrome.browser.init.ChainedTasks;
|
||||
import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
|
||||
@@ -214,7 +212,6 @@ public class CustomTabsConnection {
|
||||
|
||||
private volatile ChainedTasks mWarmupTasks;
|
||||
|
||||
- private @Nullable ModuleLoader mModuleLoader;
|
||||
/**
|
||||
* <strong>DO NOT CALL</strong>
|
||||
* Public to be instanciable from {@link ChromeApplication}. This is however
|
||||
@@ -1323,7 +1320,6 @@ public class CustomTabsConnection {
|
||||
if (ChromeApplication.isSevereMemorySignal(level)) {
|
||||
getInstance().mClientManager.cleanupUnusedSessions();
|
||||
}
|
||||
- if (getInstance().mModuleLoader != null) getInstance().mModuleLoader.onTrimMemory(level);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
@@ -1464,32 +1460,6 @@ public class CustomTabsConnection {
|
||||
CustomTabsSessionToken session, String url, String origin, int referrerPolicy,
|
||||
@DetachedResourceRequestMotivation int motivation);
|
||||
|
||||
- public ModuleLoader getModuleLoader(ComponentName componentName, @Nullable String assetName) {
|
||||
- if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CCT_MODULE_DEX_LOADING)) {
|
||||
- assetName = null;
|
||||
- }
|
||||
-
|
||||
- if (mModuleLoader != null) {
|
||||
- boolean isComponentNameChanged =
|
||||
- !componentName.equals(mModuleLoader.getComponentName());
|
||||
- boolean isAssetNameChanged =
|
||||
- !TextUtils.equals(assetName, mModuleLoader.getDexAssetName());
|
||||
- ModuleLoader.ModuleApkVersion newModuleApkVersion =
|
||||
- ModuleLoader.ModuleApkVersion.getModuleVersion(componentName.getPackageName());
|
||||
- boolean isModuleVersionChanged =
|
||||
- !mModuleLoader.getModuleApkVersion().equals(newModuleApkVersion);
|
||||
-
|
||||
- if (isComponentNameChanged || isAssetNameChanged || isModuleVersionChanged) {
|
||||
- mModuleLoader.destroyModule(ModuleMetrics.DestructionReason.MODULE_LOADER_CHANGED);
|
||||
- mModuleLoader = null;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (mModuleLoader == null) mModuleLoader = new ModuleLoader(componentName, assetName);
|
||||
-
|
||||
- return mModuleLoader;
|
||||
- }
|
||||
-
|
||||
@CalledByNative
|
||||
public static void notifyClientOfDetachedRequestCompletion(
|
||||
CustomTabsSessionToken session, String url, int status) {
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
|
||||
@@ -16,8 +16,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigatio
|
||||
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabController;
|
||||
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabFactory;
|
||||
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;
|
||||
-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleCoordinator;
|
||||
-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleToolbarController;
|
||||
import org.chromium.chrome.browser.dependency_injection.ActivityScope;
|
||||
import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
|
||||
import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
|
||||
@@ -33,8 +31,6 @@ import dagger.Subcomponent;
|
||||
@ActivityScope
|
||||
public interface CustomTabActivityComponent extends ChromeActivityComponent {
|
||||
TrustedWebActivityCoordinator resolveTrustedWebActivityCoordinator();
|
||||
- DynamicModuleToolbarController resolveDynamicModuleToolbarController();
|
||||
- DynamicModuleCoordinator resolveDynamicModuleCoordinator();
|
||||
|
||||
TabObserverRegistrar resolveTabObserverRegistrar();
|
||||
CustomTabTopBarDelegate resolveTobBarDelegate();
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -46,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureLi
|
||||
diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
|
||||
--- a/components/variations/service/variations_service.cc
|
||||
+++ b/components/variations/service/variations_service.cc
|
||||
@@ -239,17 +239,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
|
||||
@@ -240,17 +240,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
|
||||
// Variations seed fetching is only enabled in official Chrome builds, if a URL
|
||||
// is specified on the command line, and for testing.
|
||||
bool IsFetchingEnabled() {
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
From: Daniel Micay <danielmicay@gmail.com>
|
||||
Date: Sat, 26 Nov 2016 14:57:22 -0500
|
||||
Subject: Disable hyperlink auditing by default
|
||||
|
||||
---
|
||||
chrome/browser/about_flags.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -1325,7 +1325,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
SINGLE_VALUE_TYPE(switches::kDisableIpcFloodingProtection)},
|
||||
{"disable-hyperlink-auditing", flag_descriptions::kHyperlinkAuditingName,
|
||||
flag_descriptions::kHyperlinkAuditingDescription, kOsAll,
|
||||
- SINGLE_DISABLE_VALUE_TYPE(switches::kNoPings)},
|
||||
+ SINGLE_VALUE_TYPE(switches::kNoPings)},
|
||||
#if defined(OS_ANDROID)
|
||||
{"contextual-search", flag_descriptions::kContextualSearchName,
|
||||
flag_descriptions::kContextualSearchDescription, kOsAndroid,
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -10,7 +10,7 @@ Subject: Disable metrics collection for NTP tiles
|
||||
diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
|
||||
--- a/chrome/browser/android/ntp/most_visited_sites_bridge.cc
|
||||
+++ b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
|
||||
@@ -22,7 +22,6 @@
|
||||
@@ -23,7 +23,6 @@
|
||||
#include "chrome/browser/profiles/profile_android.h"
|
||||
#include "components/favicon_base/favicon_types.h"
|
||||
#include "components/history/core/browser/history_service.h"
|
||||
@@ -18,7 +18,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
|
||||
#include "components/ntp_tiles/most_visited_sites.h"
|
||||
#include "components/ntp_tiles/section_type.h"
|
||||
#include "components/rappor/rappor_service_impl.h"
|
||||
@@ -44,7 +43,6 @@ using ntp_tiles::NTPTilesVector;
|
||||
@@ -45,7 +44,6 @@ using ntp_tiles::NTPTilesVector;
|
||||
using ntp_tiles::SectionType;
|
||||
using ntp_tiles::TileTitleSource;
|
||||
using ntp_tiles::TileSource;
|
||||
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -239,7 +237,6 @@ void MostVisitedSitesBridge::RecordPageImpression(
|
||||
@@ -240,7 +238,6 @@ void MostVisitedSitesBridge::RecordPageImpression(
|
||||
JNIEnv* env,
|
||||
const JavaParamRef<jobject>& obj,
|
||||
jint jtiles_count) {
|
||||
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
|
||||
}
|
||||
|
||||
void MostVisitedSitesBridge::RecordTileImpression(
|
||||
@@ -252,18 +249,6 @@ void MostVisitedSitesBridge::RecordTileImpression(
|
||||
@@ -253,18 +250,6 @@ void MostVisitedSitesBridge::RecordTileImpression(
|
||||
jint jsource,
|
||||
jlong jdata_generation_time_ms,
|
||||
const JavaParamRef<jstring>& jurl) {
|
||||
@@ -53,7 +53,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
|
||||
}
|
||||
|
||||
void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
|
||||
@@ -274,12 +259,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
|
||||
@@ -275,12 +260,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
|
||||
jint title_source,
|
||||
jint source,
|
||||
jlong jdata_generation_time_ms) {
|
||||
|
||||
@@ -10,7 +10,7 @@ Subject: Disable metrics on all I/O threads
|
||||
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
|
||||
--- a/chrome/browser/browser_process_impl.cc
|
||||
+++ b/chrome/browser/browser_process_impl.cc
|
||||
@@ -947,7 +947,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
|
||||
@@ -963,7 +963,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
|
||||
#endif // defined(OS_CHROMEOS)
|
||||
|
||||
registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
|
||||
@@ -22,7 +22,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
|
||||
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
|
||||
--- a/chrome/browser/profiles/profile_io_data.cc
|
||||
+++ b/chrome/browser/profiles/profile_io_data.cc
|
||||
@@ -56,8 +56,6 @@
|
||||
@@ -54,8 +54,6 @@
|
||||
#include "components/cookie_config/cookie_store_util.h"
|
||||
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
|
||||
#include "components/dom_distiller/core/url_constants.h"
|
||||
|
||||
@@ -11,7 +11,7 @@ a corresponding user option to individually disable their usage.
|
||||
diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
|
||||
--- a/components/url_formatter/url_formatter.cc
|
||||
+++ b/components/url_formatter/url_formatter.cc
|
||||
@@ -410,13 +410,13 @@ IDNConversionStatus IDNToUnicodeOneComponent(const base::char16* comp,
|
||||
@@ -424,13 +424,13 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
|
||||
} // namespace
|
||||
|
||||
const FormatUrlType kFormatUrlOmitNothing = 0;
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Disable plugins enumeration
|
||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
||||
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||
@@ -1321,10 +1321,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
|
||||
@@ -1255,10 +1255,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
|
||||
}
|
||||
|
||||
PluginData* LocalFrame::GetPluginData() const {
|
||||
|
||||
@@ -5,11 +5,11 @@ Subject: Disable promos displayed in bookmarks manager
|
||||
Remove personalized signin promo view from
|
||||
bookmarks, never reach signin thresholds.
|
||||
---
|
||||
.../personalized_signin_promo_view_bookmarks.xml | 30 ----------------------
|
||||
.../browser/bookmarks/BookmarkItemsAdapter.java | 23 ++---------------
|
||||
.../browser/signin/SigninPromoController.java | 19 ++------------
|
||||
chrome/android/java_sources.gni | 1 -
|
||||
4 files changed, 4 insertions(+), 69 deletions(-)
|
||||
.../personalized_signin_promo_view_bookmarks.xml | 30 -------------
|
||||
.../browser/bookmarks/BookmarkItemsAdapter.java | 23 +---------
|
||||
.../browser/bookmarks/BookmarkPromoHeader.java | 52 +---------------------
|
||||
.../browser/signin/SigninPromoController.java | 19 +-------
|
||||
4 files changed, 5 insertions(+), 119 deletions(-)
|
||||
delete mode 100644 chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
|
||||
|
||||
diff --git a/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml b/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
|
||||
@@ -124,6 +124,96 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
||||
}
|
||||
|
||||
private void populateTopLevelFoldersList() {
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
|
||||
@@ -17,7 +17,6 @@ import android.view.ViewGroup;
|
||||
import org.chromium.base.ContextUtils;
|
||||
import org.chromium.base.VisibleForTesting;
|
||||
import org.chromium.chrome.R;
|
||||
-import org.chromium.chrome.browser.signin.PersonalizedSigninPromoView;
|
||||
import org.chromium.chrome.browser.signin.ProfileDataCache;
|
||||
import org.chromium.chrome.browser.signin.SigninAccessPoint;
|
||||
import org.chromium.chrome.browser.signin.SigninManager;
|
||||
@@ -131,18 +130,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
|
||||
}
|
||||
|
||||
/**
|
||||
- * @return Personalized signin promo header {@link ViewHolder} instance that can be used with
|
||||
- * {@link RecyclerView}.
|
||||
- */
|
||||
- ViewHolder createPersonalizedSigninPromoHolder(ViewGroup parent) {
|
||||
- View view = LayoutInflater.from(mContext).inflate(
|
||||
- R.layout.personalized_signin_promo_view_bookmarks, parent, false);
|
||||
-
|
||||
- // ViewHolder is abstract and it cannot be instantiated directly.
|
||||
- return new ViewHolder(view) {};
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
* @return Sync promo header {@link ViewHolder} instance that can be used with
|
||||
* {@link RecyclerView}.
|
||||
*/
|
||||
@@ -153,42 +140,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
|
||||
return new ViewHolder(view) {};
|
||||
}
|
||||
|
||||
- /**
|
||||
- * Configures the personalized signin promo and records promo impressions.
|
||||
- * @param view The view to be configured.
|
||||
- */
|
||||
- void setupPersonalizedSigninPromo(PersonalizedSigninPromoView view) {
|
||||
- SigninPromoUtil.setupPromoViewFromCache(mSigninPromoController, mProfileDataCache, view,
|
||||
- this::setPersonalizedSigninPromoDeclined);
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * Detaches the previously configured {@link PersonalizedSigninPromoView}.
|
||||
- */
|
||||
- void detachPersonalizePromoView() {
|
||||
- if (mSigninPromoController != null) mSigninPromoController.detach();
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * Saves that the personalized signin promo was declined and updates the UI.
|
||||
- */
|
||||
- private void setPersonalizedSigninPromoDeclined() {
|
||||
- SharedPreferences.Editor sharedPreferencesEditor =
|
||||
- ContextUtils.getAppSharedPreferences().edit();
|
||||
- sharedPreferencesEditor.putBoolean(PREF_PERSONALIZED_SIGNIN_PROMO_DECLINED, true);
|
||||
- sharedPreferencesEditor.apply();
|
||||
- mPromoState = calculatePromoState();
|
||||
- triggerPromoUpdate();
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * @return Whether the user declined the personalized signin promo.
|
||||
- */
|
||||
- private boolean wasPersonalizedSigninPromoDeclined() {
|
||||
- return ContextUtils.getAppSharedPreferences().getBoolean(
|
||||
- PREF_PERSONALIZED_SIGNIN_PROMO_DECLINED, false);
|
||||
- }
|
||||
-
|
||||
private @PromoState int calculatePromoState() {
|
||||
if (sPromoStateForTests != null) {
|
||||
return sPromoStateForTests;
|
||||
@@ -202,7 +153,7 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
|
||||
boolean impressionLimitReached = !SigninPromoController.hasNotReachedImpressionLimit(
|
||||
SigninAccessPoint.BOOKMARK_MANAGER);
|
||||
if (!mSignInManager.isSignInAllowed() || !SigninPromoController.isSignInPromoAllowed()
|
||||
- || impressionLimitReached || wasPersonalizedSigninPromoDeclined()) {
|
||||
+ || impressionLimitReached) {
|
||||
return PromoState.PROMO_NONE;
|
||||
}
|
||||
return PromoState.PROMO_SIGNIN_PERSONALIZED;
|
||||
@@ -250,7 +201,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
|
||||
}
|
||||
|
||||
private void triggerPromoUpdate() {
|
||||
- detachPersonalizePromoView();
|
||||
mPromoHeaderChangeAction.run();
|
||||
}
|
||||
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
|
||||
@@ -153,17 +243,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPr
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
|
||||
--- a/chrome/android/java_sources.gni
|
||||
+++ b/chrome/android/java_sources.gni
|
||||
@@ -189,7 +189,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java",
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkModel.java",
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java",
|
||||
- "java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java",
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java",
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIObserver.java",
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java",
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -12,10 +12,10 @@ Subject: Disable references to fonts.googleapis.com
|
||||
diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
|
||||
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
|
||||
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
|
||||
@@ -310,7 +310,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
|
||||
@@ -309,7 +309,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
|
||||
}
|
||||
|
||||
std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
|
||||
const {
|
||||
std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() const {
|
||||
- return "style-src 'self' https://fonts.googleapis.com;";
|
||||
+ return "style-src 'self';";
|
||||
}
|
||||
@@ -36,8 +36,8 @@ diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_di
|
||||
diff --git a/components/dom_distiller/core/javascript/dom_distiller_viewer.js b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
|
||||
--- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
|
||||
+++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
|
||||
@@ -120,7 +120,7 @@ function maybeSetWebFont() {
|
||||
if (distiller_on_ios) return;
|
||||
@@ -123,7 +123,7 @@ function maybeSetWebFont() {
|
||||
return;
|
||||
|
||||
var e = document.createElement('link');
|
||||
- e.href = 'https://fonts.googleapis.com/css?family=Roboto';
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Disable seed-based field trials
|
||||
diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
|
||||
--- a/components/variations/service/variations_field_trial_creator.cc
|
||||
+++ b/components/variations/service/variations_field_trial_creator.cc
|
||||
@@ -513,8 +513,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
|
||||
@@ -512,8 +512,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
|
||||
#endif // BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
|
||||
bool used_seed = false;
|
||||
if (!used_testing_config) {
|
||||
|
||||
@@ -4,82 +4,74 @@ Subject: Disable signin and data saver preferences
|
||||
|
||||
Never show the data saver promo snackbar
|
||||
---
|
||||
chrome/android/java/res/xml/main_preferences.xml | 9 -----
|
||||
.../chromium/chrome/browser/ChromeActivity.java | 6 ++-
|
||||
.../browser/preferences/MainPreferences.java | 46 ++++++----------------
|
||||
3 files changed, 15 insertions(+), 46 deletions(-)
|
||||
chrome/android/java/res/xml/main_preferences.xml | 20 -----
|
||||
.../android/java/res/xml/privacy_preferences.xml | 7 --
|
||||
.../browser/preferences/MainPreferences.java | 92 +---------------------
|
||||
.../preferences/privacy/PrivacyPreferences.java | 17 ----
|
||||
.../java/strings/android_chrome_strings.grd | 6 --
|
||||
5 files changed, 1 insertion(+), 141 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
|
||||
--- a/chrome/android/java/res/xml/main_preferences.xml
|
||||
+++ b/chrome/android/java/res/xml/main_preferences.xml
|
||||
@@ -10,10 +10,6 @@
|
||||
android:key="account_section"
|
||||
android:order="0"
|
||||
android:title="@string/prefs_section_account"/>
|
||||
@@ -7,21 +7,6 @@
|
||||
android:orderingFromXml="false">
|
||||
|
||||
<PreferenceCategory
|
||||
- android:key="account_section"
|
||||
- android:order="0"
|
||||
- android:title="@string/prefs_section_account"/>
|
||||
- <org.chromium.chrome.browser.preferences.SignInPreference
|
||||
- android:key="sign_in"
|
||||
- android:order="1"
|
||||
- android:title="@string/sign_in_to_chrome"/>
|
||||
<org.chromium.chrome.browser.preferences.ChromeBasePreference
|
||||
android:fragment="org.chromium.chrome.browser.preferences.SyncAndServicesPreferences"
|
||||
android:key="sync_and_services"
|
||||
@@ -89,11 +85,6 @@
|
||||
- <org.chromium.chrome.browser.preferences.ChromeBasePreference
|
||||
- android:key="sync_and_services"
|
||||
- android:order="2"
|
||||
- android:layout="@layout/account_management_account_row"
|
||||
- android:title="@string/prefs_sync_and_services"
|
||||
- android:fragment="org.chromium.chrome.browser.preferences.SyncAndServicesPreferences"/>
|
||||
-
|
||||
- <PreferenceCategory
|
||||
android:key="basics_section"
|
||||
android:order="3"
|
||||
android:title="@string/prefs_section_basics"/>
|
||||
@@ -95,11 +80,6 @@
|
||||
android:key="languages"
|
||||
android:order="16"
|
||||
android:order="17"
|
||||
android:title="@string/prefs_languages"/>
|
||||
- <org.chromium.chrome.browser.preferences.datareduction.DataReductionPreference
|
||||
- android:fragment="org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferenceFragment"
|
||||
- android:key="data_reduction"
|
||||
- android:order="17"
|
||||
- android:order="18"
|
||||
- android:title="@string/data_reduction_title"/>
|
||||
<org.chromium.chrome.browser.preferences.ChromeBasePreference
|
||||
android:fragment="org.chromium.chrome.browser.preferences.download.DownloadPreferences"
|
||||
android:key="downloads"
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
@@ -125,7 +125,7 @@ import org.chromium.chrome.browser.printing.TabPrinter;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
import org.chromium.chrome.browser.share.ShareMenuActionHandler;
|
||||
import org.chromium.chrome.browser.snackbar.BottomContainer;
|
||||
-import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
|
||||
+//import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
|
||||
import org.chromium.chrome.browser.snackbar.SnackbarManager;
|
||||
import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
|
||||
import org.chromium.chrome.browser.sync.ProfileSyncService;
|
||||
@@ -275,7 +275,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
private EphemeralTabPanel mEphemeralTabPanel;
|
||||
protected ReaderModeManager mReaderModeManager;
|
||||
private SnackbarManager mSnackbarManager;
|
||||
- private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
|
||||
+ //private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
|
||||
private AppMenuPropertiesDelegate mAppMenuPropertiesDelegate;
|
||||
private AppMenuHandler mAppMenuHandler;
|
||||
private ToolbarManager mToolbarManager;
|
||||
@@ -694,6 +694,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(mTabModelSelector) {
|
||||
@Override
|
||||
public void didFirstVisuallyNonEmptyPaint(Tab tab) {
|
||||
+/*
|
||||
// Only alert about data savings once the first paint has happened. It
|
||||
// doesn't make sense to show a snackbar about savings when nothing has been
|
||||
// displayed yet.
|
||||
@@ -707,6 +708,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
DataReductionProxySettings.getInstance()
|
||||
.getTotalHttpContentLengthSaved());
|
||||
}
|
||||
+*/
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
--- a/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
|
||||
@@ -55,11 +55,4 @@
|
||||
android:title="@string/clear_browsing_data_title"
|
||||
android:summary="@string/clear_browsing_data_summary"
|
||||
android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
|
||||
- <Preference
|
||||
- android:key="sync_and_services_link_divider"
|
||||
- android:layout="@layout/divider_preference"
|
||||
- android:selectable="false"/>
|
||||
- <org.chromium.chrome.browser.preferences.TextMessagePreference
|
||||
- android:key="sync_and_services_link"
|
||||
- tools:summary="@string/privacy_sync_and_services_link"/>
|
||||
</PreferenceScreen>
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
|
||||
@@ -17,11 +17,9 @@ import org.chromium.base.VisibleForTesting;
|
||||
@@ -17,17 +17,13 @@ import org.chromium.base.VisibleForTesting;
|
||||
import org.chromium.chrome.R;
|
||||
import org.chromium.chrome.browser.ChromeFeatureList;
|
||||
import org.chromium.chrome.browser.contextual_suggestions.ContextualSuggestionsEnabledStateUtils;
|
||||
-import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
|
||||
import org.chromium.chrome.browser.night_mode.NightModeUtils;
|
||||
import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
|
||||
import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
|
||||
import org.chromium.chrome.browser.preferences.autofill_assistant.AutofillAssistantPreferences;
|
||||
@@ -87,21 +79,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
|
||||
import org.chromium.chrome.browser.preferences.developer.DeveloperPreferences;
|
||||
import org.chromium.chrome.browser.search_engines.TemplateUrl;
|
||||
import org.chromium.chrome.browser.search_engines.TemplateUrlService;
|
||||
@@ -37,13 +35,11 @@ import java.util.Map;
|
||||
-import org.chromium.chrome.browser.signin.SigninManager;
|
||||
-import org.chromium.chrome.browser.sync.ProfileSyncService;
|
||||
import org.chromium.chrome.browser.util.FeatureUtilities;
|
||||
|
||||
import java.util.HashMap;
|
||||
@@ -37,11 +33,7 @@ import java.util.Map;
|
||||
* The main settings screen, shown when the user first opens Settings.
|
||||
*/
|
||||
public class MainPreferences extends PreferenceFragment
|
||||
implements SigninManager.SignInStateObserver, TemplateUrlService.LoadListener {
|
||||
public static final String PREF_ACCOUNT_SECTION = "account_section";
|
||||
- implements TemplateUrlService.LoadListener, ProfileSyncService.SyncStateChangedListener,
|
||||
- SigninManager.SignInStateObserver {
|
||||
- public static final String PREF_ACCOUNT_SECTION = "account_section";
|
||||
- public static final String PREF_SIGN_IN = "sign_in";
|
||||
public static final String PREF_SYNC_AND_SERVICES = "sync_and_services";
|
||||
- public static final String PREF_SYNC_AND_SERVICES = "sync_and_services";
|
||||
+ implements TemplateUrlService.LoadListener {
|
||||
public static final String PREF_SEARCH_ENGINE = "search_engine";
|
||||
public static final String PREF_SAVED_PASSWORDS = "saved_passwords";
|
||||
public static final String PREF_CONTEXTUAL_SUGGESTIONS = "contextual_suggestions";
|
||||
public static final String PREF_HOMEPAGE = "homepage";
|
||||
- public static final String PREF_DATA_REDUCTION = "data_reduction";
|
||||
public static final String PREF_NOTIFICATIONS = "notifications";
|
||||
public static final String PREF_LANGUAGES = "languages";
|
||||
public static final String PREF_DOWNLOADS = "downloads";
|
||||
@@ -57,7 +53,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
@@ -61,7 +53,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
|
||||
private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
|
||||
private final Map<String, Preference> mAllPreferences = new HashMap<>();
|
||||
@@ -109,38 +105,41 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
|
||||
|
||||
public MainPreferences() {
|
||||
setHasOptionsMenu(true);
|
||||
@@ -73,25 +68,29 @@ public class MainPreferences extends PreferenceFragment
|
||||
@@ -77,33 +68,16 @@ public class MainPreferences extends PreferenceFragment
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
super.onDestroy();
|
||||
- mSignInPreference.onPreferenceFragmentDestroyed();
|
||||
+ //mSignInPreference.onPreferenceFragmentDestroyed();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
+/*
|
||||
if (SigninManager.get().isSigninSupported()) {
|
||||
SigninManager.get().addSignInStateObserver(this);
|
||||
mSignInPreference.registerForUpdates();
|
||||
}
|
||||
+*/
|
||||
- if (SigninManager.get().isSigninSupported()) {
|
||||
- SigninManager.get().addSignInStateObserver(this);
|
||||
- mSignInPreference.registerForUpdates();
|
||||
- }
|
||||
- ProfileSyncService syncService = ProfileSyncService.get();
|
||||
- if (syncService != null) {
|
||||
- syncService.addSyncStateChangedListener(this);
|
||||
- }
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop() {
|
||||
super.onStop();
|
||||
+/*
|
||||
if (SigninManager.get().isSigninSupported()) {
|
||||
SigninManager.get().removeSignInStateObserver(this);
|
||||
mSignInPreference.unregisterForUpdates();
|
||||
}
|
||||
+*/
|
||||
- if (SigninManager.get().isSigninSupported()) {
|
||||
- SigninManager.get().removeSignInStateObserver(this);
|
||||
- mSignInPreference.unregisterForUpdates();
|
||||
- }
|
||||
- ProfileSyncService syncService = ProfileSyncService.get();
|
||||
- if (syncService != null) {
|
||||
- syncService.removeSyncStateChangedListener(this);
|
||||
- }
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -104,17 +103,12 @@ public class MainPreferences extends PreferenceFragment
|
||||
@@ -116,17 +90,9 @@ public class MainPreferences extends PreferenceFragment
|
||||
PreferenceUtils.addPreferencesFromResource(this, R.xml.main_preferences);
|
||||
cachePreferences();
|
||||
|
||||
@@ -150,9 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
|
||||
- getPreferenceScreen().removePreference(findPreference(PREF_ACCOUNT_SECTION));
|
||||
- getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES));
|
||||
- }
|
||||
+ getPreferenceScreen().removePreference(findPreference(PREF_ACCOUNT_SECTION));
|
||||
+ getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES));
|
||||
|
||||
-
|
||||
updatePasswordsPreference();
|
||||
|
||||
setManagedPreferenceDelegateForPreference(PREF_SEARCH_ENGINE);
|
||||
@@ -160,16 +157,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
// If we are on Android O+ the Notifications preference should lead to the Android
|
||||
@@ -178,7 +172,7 @@ public class MainPreferences extends PreferenceFragment
|
||||
@@ -190,7 +156,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
Preference preference = getPreferenceScreen().getPreference(index);
|
||||
mAllPreferences.put(preference.getKey(), preference);
|
||||
}
|
||||
- mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
|
||||
+ //mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
|
||||
}
|
||||
|
||||
private void setManagedPreferenceDelegateForPreference(String key) {
|
||||
@@ -187,12 +181,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
@@ -199,13 +164,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
}
|
||||
|
||||
private void updatePreferences() {
|
||||
@@ -179,10 +175,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
|
||||
- removePreferenceIfPresent(PREF_SIGN_IN);
|
||||
- }
|
||||
-
|
||||
- updateSyncAndServicesPreference();
|
||||
updateSearchEnginePreference();
|
||||
|
||||
Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE);
|
||||
@@ -216,10 +204,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
@@ -235,10 +193,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
} else {
|
||||
removePreferenceIfPresent(PREF_DEVELOPER);
|
||||
}
|
||||
@@ -193,22 +190,64 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
|
||||
}
|
||||
|
||||
private Preference addPreferenceIfAbsent(String key) {
|
||||
@@ -279,11 +263,11 @@ public class MainPreferences extends PreferenceFragment
|
||||
|
||||
private void onSignInPreferenceStateChanged() {
|
||||
// Remove "Account" section header if the personalized sign-in promo is shown.
|
||||
- if (mSignInPreference.getState() == SignInPreference.State.PERSONALIZED_PROMO) {
|
||||
+// if (mSignInPreference.getState() == SignInPreference.State.PERSONALIZED_PROMO) {
|
||||
removePreferenceIfPresent(PREF_ACCOUNT_SECTION);
|
||||
- } else {
|
||||
+/* } else {
|
||||
addPreferenceIfAbsent(PREF_ACCOUNT_SECTION);
|
||||
- }
|
||||
+ }*/
|
||||
@@ -252,15 +206,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
if (preference != null) getPreferenceScreen().removePreference(preference);
|
||||
}
|
||||
|
||||
- private void updateSyncAndServicesPreference() {
|
||||
- if (!ChromeFeatureList.isEnabled(ChromeFeatureList.UNIFIED_CONSENT)) return;
|
||||
-
|
||||
- ChromeBasePreference syncAndServices =
|
||||
- (ChromeBasePreference) findPreference(PREF_SYNC_AND_SERVICES);
|
||||
- syncAndServices.setIcon(SyncPreferenceUtils.getSyncStatusIcon(getActivity()));
|
||||
- syncAndServices.setSummary(SyncPreferenceUtils.getSyncStatusSummary(getActivity()));
|
||||
- }
|
||||
-
|
||||
private void updateSearchEnginePreference() {
|
||||
if (!TemplateUrlService.getInstance().isLoaded()) {
|
||||
ChromeBasePreference searchEnginePref =
|
||||
@@ -292,28 +237,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
pref.setSummary(getResources().getString(isOn ? R.string.text_on : R.string.text_off));
|
||||
}
|
||||
|
||||
- // SigninManager.SignInStateObserver implementation.
|
||||
- @Override
|
||||
- public void onSignedIn() {
|
||||
- // After signing in or out of a managed account, preferences may change or become enabled
|
||||
- // or disabled.
|
||||
- new Handler().post(() -> updatePreferences());
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void onSignedOut() {
|
||||
- updatePreferences();
|
||||
- }
|
||||
-
|
||||
- private void onSignInPreferenceStateChanged() {
|
||||
- // Remove "Account" section header if the personalized sign-in promo is shown.
|
||||
- if (mSignInPreference.getState() == SignInPreference.State.PERSONALIZED_PROMO) {
|
||||
- removePreferenceIfPresent(PREF_ACCOUNT_SECTION);
|
||||
- } else {
|
||||
- addPreferenceIfAbsent(PREF_ACCOUNT_SECTION);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
// TemplateUrlService.LoadListener implementation.
|
||||
@@ -302,9 +286,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
@Override
|
||||
public void onTemplateUrlServiceLoaded() {
|
||||
@@ -321,11 +244,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
updateSearchEnginePreference();
|
||||
}
|
||||
|
||||
- @Override
|
||||
- public void syncStateChanged() {
|
||||
- updateSyncAndServicesPreference();
|
||||
- }
|
||||
-
|
||||
@VisibleForTesting
|
||||
ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() {
|
||||
return mManagedPreferenceDelegate;
|
||||
@@ -335,9 +253,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
return new ManagedPreferenceDelegate() {
|
||||
@Override
|
||||
public boolean isPreferenceControlledByPolicy(Preference preference) {
|
||||
@@ -218,7 +257,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
|
||||
if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
|
||||
return TemplateUrlService.getInstance().isDefaultSearchManaged();
|
||||
}
|
||||
@@ -313,11 +294,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
@@ -346,11 +261,6 @@ public class MainPreferences extends PreferenceFragment
|
||||
|
||||
@Override
|
||||
public boolean isPreferenceClickDisabledByPolicy(Preference preference) {
|
||||
@@ -230,6 +269,73 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
|
||||
if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
|
||||
return TemplateUrlService.getInstance().isDefaultSearchManaged();
|
||||
}
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
|
||||
@@ -27,7 +27,6 @@ import org.chromium.chrome.browser.preferences.Pref;
|
||||
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
|
||||
import org.chromium.chrome.browser.preferences.PreferenceUtils;
|
||||
import org.chromium.chrome.browser.preferences.PreferencesLauncher;
|
||||
-import org.chromium.chrome.browser.preferences.SyncAndServicesPreferences;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
|
||||
import org.chromium.ui.text.NoUnderlineClickableSpan;
|
||||
@@ -49,9 +48,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
private static final String PREF_DO_NOT_TRACK = "do_not_track";
|
||||
private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
|
||||
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
|
||||
- private static final String PREF_SYNC_AND_SERVICES_LINK_DIVIDER =
|
||||
- "sync_and_services_link_divider";
|
||||
- private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
|
||||
private static final String PREF_USAGE_STATS = "usage_stats_reporting";
|
||||
|
||||
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
|
||||
@@ -100,22 +96,9 @@ public class PrivacyPreferences extends PreferenceFragment
|
||||
networkPredictionPref.setOrder(canMakePaymentPref.getOrder());
|
||||
preferenceScreen.addPreference(networkPredictionPref);
|
||||
|
||||
- Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
|
||||
- NoUnderlineClickableSpan linkSpan =
|
||||
- new NoUnderlineClickableSpan(getResources(), view -> {
|
||||
- PreferencesLauncher.launchSettingsPage(getActivity(),
|
||||
- SyncAndServicesPreferences.class,
|
||||
- SyncAndServicesPreferences.createArguments(false));
|
||||
- });
|
||||
- syncAndServicesLink.setSummary(
|
||||
- SpanApplier.applySpans(getString(R.string.privacy_sync_and_services_link),
|
||||
- new SpanApplier.SpanInfo("<link>", "</link>", linkSpan)));
|
||||
-
|
||||
updateSummaries();
|
||||
return;
|
||||
}
|
||||
- preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
|
||||
- preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
|
||||
|
||||
ChromeBaseCheckBoxPreference navigationErrorPref =
|
||||
(ChromeBaseCheckBoxPreference) findPreference(PREF_NAVIGATION_ERROR);
|
||||
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
--- a/chrome/android/java/strings/android_chrome_strings.grd
|
||||
+++ b/chrome/android/java/strings/android_chrome_strings.grd
|
||||
@@ -324,9 +324,6 @@ CHAR-LIMIT guidelines:
|
||||
</message>
|
||||
|
||||
<!-- Sign-in, sync and personalization preferences -->
|
||||
- <message name="IDS_PREFS_SECTION_ACCOUNT" desc="Title for the group of account-related entries in Settings. [CHAR-LIMIT=32]">
|
||||
- Account
|
||||
- </message>
|
||||
<message name="IDS_SIGN_IN_TO_CHROME" desc="Title for the button to sign in to Chrome using one's Google account. [CHAR-LIMIT=27]">
|
||||
Sign in to Chrome
|
||||
</message>
|
||||
@@ -409,9 +406,6 @@ CHAR-LIMIT guidelines:
|
||||
<message name="IDS_URL_KEYED_ANONYMIZED_DATA_SUMMARY" desc="Summary for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
|
||||
Sends URLs of pages you visit to Google
|
||||
</message>
|
||||
- <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK" desc="The text for Privacy preferences that is shown after all preference rows.">
|
||||
- For more settings that relate to privacy, security, and data collection, see <ph name="BEGIN_LINK"><link></ph>Sync and Google services<ph name="END_LINK"></link></ph>
|
||||
- </message>
|
||||
<message name="IDS_USAGE_AND_CRASH_REPORTS_TITLE" desc="Title for a preference that enables sending usage statistics and crash reports.">
|
||||
Help improve Chrome's features and performance
|
||||
</message>
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Disable signin/data reduction promos
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -599,34 +599,10 @@ public class ChromeTabbedActivity
|
||||
@@ -702,34 +702,10 @@ public class ChromeTabbedActivity
|
||||
}
|
||||
|
||||
ChromePreferenceManager preferenceManager = ChromePreferenceManager.getInstance();
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Mon, 24 Apr 2017 16:11:53 +0200
|
||||
Subject: Disable smooth scrolling on Linux
|
||||
|
||||
Smooth scrolling (while using mousewheel or arrow keys) is a really
|
||||
dumb idea. Text naturally appears as a blur while it moves, and the
|
||||
animation takes that-many milliseconds to finish, so it's a time
|
||||
waster too.
|
||||
|
||||
Only the fallback setting, which is used on Linux, is changed; on
|
||||
Windows/MacOS, smooth scrolling remains controlled by a system
|
||||
setting.
|
||||
---
|
||||
ui/gfx/animation/animation.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ui/gfx/animation/animation.cc b/ui/gfx/animation/animation.cc
|
||||
--- a/ui/gfx/animation/animation.cc
|
||||
+++ b/ui/gfx/animation/animation.cc
|
||||
@@ -111,7 +111,7 @@ bool Animation::ShouldRenderRichAnimationImpl() {
|
||||
// static
|
||||
bool Animation::ScrollAnimationsEnabledBySystem() {
|
||||
// Defined in platform specific files for Windows and OSX.
|
||||
- return true;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
bool Animation::PrefersReducedMotion() {
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,507 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Sun, 14 Apr 2019 12:08:27 +0200
|
||||
Subject: Disable unused permissions
|
||||
|
||||
Disable sync adaptive and invalidation services from manifest
|
||||
|
||||
Prevents authorization prompt for Play services on reboot
|
||||
|
||||
Fixes building with debug symbols:
|
||||
|
||||
ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
|
||||
>>> referenced by invalidation_service_util.cc:17 (../../components/invalidation/impl/invalidation_service_util.cc:17)
|
||||
>>> impl/invalidation_service_util.o:(invalidation::ParseNotifierOptions(base::CommandLine const&)) in archive obj/components/invalidation/impl/libimpl.a
|
||||
|
||||
Fixup more permission removal
|
||||
---
|
||||
chrome/android/BUILD.gn | 4 +-
|
||||
chrome/android/java/AndroidManifest.xml | 27 -----
|
||||
.../chromium/chrome/browser/ChromeActivity.java | 34 ------
|
||||
.../invalidation/impl/invalidation_service_util.cc | 21 ----
|
||||
.../invalidation/impl/invalidation_service_util.h | 6 +-
|
||||
.../signin/SystemAccountManagerDelegate.java | 38 +------
|
||||
.../components/sync/AndroidSyncSettings.java | 24 +---
|
||||
.../chromium/net/HttpNegotiateAuthenticator.java | 122 +--------------------
|
||||
.../chromoting/base/OAuthTokenFetcher.java | 2 -
|
||||
9 files changed, 13 insertions(+), 265 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
+++ b/chrome/android/BUILD.gn
|
||||
@@ -1042,8 +1042,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
|
||||
resources = [
|
||||
"java/res_template/xml/file_paths.xml",
|
||||
"java/res_template/xml/launchershortcuts.xml",
|
||||
- "java/res_template/xml/searchable.xml",
|
||||
- "java/res_template/xml/syncadapter.xml",
|
||||
+ "java/res_template/xml/searchable.xml"
|
||||
]
|
||||
res_dir = "java/res_template"
|
||||
variables = [ "manifest_package=$manifest_package" ]
|
||||
@@ -1054,7 +1053,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
|
||||
"java/res_template/xml/file_paths.xml",
|
||||
"java/res_template/xml/launchershortcuts.xml",
|
||||
"java/res_template/xml/searchable.xml",
|
||||
- "java/res_template/xml/syncadapter.xml",
|
||||
]
|
||||
res_dir = "java/res_template"
|
||||
|
||||
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
||||
--- a/chrome/android/java/AndroidManifest.xml
|
||||
+++ b/chrome/android/java/AndroidManifest.xml
|
||||
@@ -44,22 +44,16 @@ by a child template that "extends" this file.
|
||||
{% if target_sdk_version|int > 27 or target_sdk_version == "Q" %}
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||
{% endif %}
|
||||
- <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
- <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
|
||||
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
|
||||
<uses-permission android:name="android.permission.NFC"/>
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
||||
- <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
|
||||
- <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
|
||||
- <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
|
||||
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
|
||||
<uses-permission android:name="android.permission.VIBRATE"/>
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
||||
- <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
|
||||
{% set enable_vr = enable_vr|default(0) %}
|
||||
{% if enable_vr == "true" %}
|
||||
<!-- Indicates use of Android's VR-mode, available only on Android N+. -->
|
||||
@@ -97,8 +91,6 @@ by a child template that "extends" this file.
|
||||
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
|
||||
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
|
||||
|
||||
- <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
|
||||
-
|
||||
{% block extra_uses_permissions %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -975,16 +967,6 @@ by a child template that "extends" this file.
|
||||
android:resource="@xml/file_paths" />
|
||||
</provider>
|
||||
|
||||
- <!-- Sync adapter for browser invalidation. -->
|
||||
- <service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
|
||||
- android:exported="false">
|
||||
- <intent-filter>
|
||||
- <action android:name="android.content.SyncAdapter" />
|
||||
- </intent-filter>
|
||||
- <meta-data android:name="android.content.SyncAdapter"
|
||||
- android:resource="@xml/syncadapter" />
|
||||
- </service>
|
||||
-
|
||||
<!-- Broadcast receiver that will be notified of account changes -->
|
||||
<receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
|
||||
<intent-filter>
|
||||
@@ -1090,15 +1072,6 @@ by a child template that "extends" this file.
|
||||
<service android:name="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"
|
||||
android:exported="false"/>
|
||||
|
||||
- <!-- Notification service for sync. -->
|
||||
- <meta-data android:name="ipc.invalidation.ticl.listener_service_class"
|
||||
- android:value="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"/>
|
||||
- <service android:name="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"
|
||||
- android:exported="false">
|
||||
- <intent-filter>
|
||||
- <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/>
|
||||
- </intent-filter>
|
||||
- </service>
|
||||
<service android:name="com.google.ipc.invalidation.ticl.android2.TiclService"
|
||||
android:exported="false"/>
|
||||
<service android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
@@ -131,8 +131,6 @@ import org.chromium.chrome.browser.share.ShareMenuActionHandler;
|
||||
import org.chromium.chrome.browser.snackbar.BottomContainer;
|
||||
import org.chromium.chrome.browser.snackbar.SnackbarManager;
|
||||
import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
|
||||
-import org.chromium.chrome.browser.sync.ProfileSyncService;
|
||||
-import org.chromium.chrome.browser.sync.SyncController;
|
||||
import org.chromium.chrome.browser.tab.Tab;
|
||||
import org.chromium.chrome.browser.tab.TabFullscreenHandler;
|
||||
import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
|
||||
@@ -283,9 +281,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
@SuppressLint("NewApi")
|
||||
private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
|
||||
|
||||
- // Observes when sync becomes ready to create the mContextReporter.
|
||||
- private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener;
|
||||
-
|
||||
@Nullable
|
||||
private ChromeFullscreenManager mFullscreenManager;
|
||||
|
||||
@@ -964,28 +959,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
private void createContextReporterIfNeeded() {
|
||||
if (!mStarted) return; // Sync state reporting should work only in started state.
|
||||
if (mContextReporter != null || getActivityTab() == null) return;
|
||||
-
|
||||
- final SyncController syncController = SyncController.get(this);
|
||||
- final ProfileSyncService syncService = ProfileSyncService.get();
|
||||
-
|
||||
- if (syncController != null && syncController.isSyncingUrlsWithKeystorePassphrase()) {
|
||||
- assert syncService != null;
|
||||
- mContextReporter = AppHooks.get().createGsaHelper().getContextReporter(this);
|
||||
-
|
||||
- if (mSyncStateChangedListener != null) {
|
||||
- syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
|
||||
- mSyncStateChangedListener = null;
|
||||
- }
|
||||
-
|
||||
- return;
|
||||
- } else {
|
||||
- ContextReporter.reportSyncStatus(syncService);
|
||||
- }
|
||||
-
|
||||
- if (mSyncStateChangedListener == null && syncService != null) {
|
||||
- mSyncStateChangedListener = () -> createContextReporterIfNeeded();
|
||||
- syncService.addSyncStateChangedListener(mSyncStateChangedListener);
|
||||
- }
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -1054,13 +1027,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
|
||||
GSAAccountChangeListener.getInstance().disconnect();
|
||||
}
|
||||
- if (mSyncStateChangedListener != null) {
|
||||
- ProfileSyncService syncService = ProfileSyncService.get();
|
||||
- if (syncService != null) {
|
||||
- syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
|
||||
- }
|
||||
- mSyncStateChangedListener = null;
|
||||
- }
|
||||
if (mContextReporter != null) mContextReporter.disable();
|
||||
|
||||
super.onStopWithNative();
|
||||
diff --git a/components/invalidation/impl/invalidation_service_util.cc b/components/invalidation/impl/invalidation_service_util.cc
|
||||
--- a/components/invalidation/impl/invalidation_service_util.cc
|
||||
+++ b/components/invalidation/impl/invalidation_service_util.cc
|
||||
@@ -12,27 +12,6 @@
|
||||
|
||||
namespace invalidation {
|
||||
|
||||
-notifier::NotifierOptions ParseNotifierOptions(
|
||||
- const base::CommandLine& command_line) {
|
||||
- notifier::NotifierOptions notifier_options;
|
||||
-
|
||||
- if (command_line.HasSwitch(switches::kSyncNotificationHostPort)) {
|
||||
- notifier_options.xmpp_host_port =
|
||||
- net::HostPortPair::FromString(
|
||||
- command_line.GetSwitchValueASCII(
|
||||
- switches::kSyncNotificationHostPort));
|
||||
- DVLOG(1) << "Using " << notifier_options.xmpp_host_port.ToString()
|
||||
- << " for test sync notification server.";
|
||||
- }
|
||||
-
|
||||
- notifier_options.allow_insecure_connection =
|
||||
- command_line.HasSwitch(switches::kSyncAllowInsecureXmppConnection);
|
||||
- DVLOG_IF(1, notifier_options.allow_insecure_connection)
|
||||
- << "Allowing insecure XMPP connections.";
|
||||
-
|
||||
- return notifier_options;
|
||||
-}
|
||||
-
|
||||
std::string GenerateInvalidatorClientId() {
|
||||
// Generate a GUID with 128 bits worth of base64-encoded randomness.
|
||||
// This format is similar to that of sync's cache_guid.
|
||||
diff --git a/components/invalidation/impl/invalidation_service_util.h b/components/invalidation/impl/invalidation_service_util.h
|
||||
--- a/components/invalidation/impl/invalidation_service_util.h
|
||||
+++ b/components/invalidation/impl/invalidation_service_util.h
|
||||
@@ -5,7 +5,7 @@
|
||||
#ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
|
||||
#define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
|
||||
|
||||
-#include "jingle/notifier/base/notifier_options.h"
|
||||
+#include <string>
|
||||
|
||||
namespace base {
|
||||
class CommandLine;
|
||||
@@ -13,10 +13,6 @@ class CommandLine;
|
||||
|
||||
namespace invalidation {
|
||||
|
||||
-// Parses the given command line for notifier options.
|
||||
-notifier::NotifierOptions ParseNotifierOptions(
|
||||
- const base::CommandLine& command_line);
|
||||
-
|
||||
// Generates a unique client ID for the invalidator.
|
||||
std::string GenerateInvalidatorClientId();
|
||||
|
||||
diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
|
||||
--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
|
||||
+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
|
||||
@@ -167,16 +167,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
|
||||
|
||||
@Override
|
||||
public boolean hasFeatures(Account account, String[] features) {
|
||||
- if (!hasGetAccountsPermission()) {
|
||||
- return false;
|
||||
- }
|
||||
- try {
|
||||
- return mAccountManager.hasFeatures(account, features, null, null).getResult();
|
||||
- } catch (AuthenticatorException | IOException e) {
|
||||
- Log.e(TAG, "Error while checking features: ", e);
|
||||
- } catch (OperationCanceledException e) {
|
||||
- Log.e(TAG, "Checking features was cancelled. This should not happen.");
|
||||
- }
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -216,32 +206,10 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
|
||||
public void updateCredentials(
|
||||
Account account, Activity activity, final Callback<Boolean> callback) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
- if (!hasManageAccountsPermission()) {
|
||||
- if (callback != null) {
|
||||
- ThreadUtils.postOnUiThread(() -> callback.onResult(false));
|
||||
- }
|
||||
- return;
|
||||
+ if (callback != null) {
|
||||
+ ThreadUtils.postOnUiThread(() -> callback.onResult(false));
|
||||
}
|
||||
-
|
||||
- AccountManagerCallback<Bundle> realCallback = future -> {
|
||||
- Bundle bundle = null;
|
||||
- try {
|
||||
- bundle = future.getResult();
|
||||
- } catch (AuthenticatorException | IOException e) {
|
||||
- Log.e(TAG, "Error while update credentials: ", e);
|
||||
- } catch (OperationCanceledException e) {
|
||||
- Log.w(TAG, "Updating credentials was cancelled.");
|
||||
- }
|
||||
- boolean success =
|
||||
- bundle != null && bundle.getString(AccountManager.KEY_ACCOUNT_TYPE) != null;
|
||||
- if (callback != null) {
|
||||
- callback.onResult(success);
|
||||
- }
|
||||
- };
|
||||
- // Android 4.4 throws NullPointerException if null is passed
|
||||
- Bundle emptyOptions = new Bundle();
|
||||
- mAccountManager.updateCredentials(
|
||||
- account, "android", emptyOptions, activity, realCallback, null);
|
||||
+ return;
|
||||
}
|
||||
|
||||
protected boolean hasGetAccountsPermission() {
|
||||
diff --git a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
|
||||
--- a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
|
||||
+++ b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
|
||||
@@ -212,13 +212,7 @@ public class AndroidSyncSettings {
|
||||
|
||||
private void setChromeSyncEnabled(boolean value) {
|
||||
synchronized (mLock) {
|
||||
- updateSyncability(null);
|
||||
- if (value == mChromeSyncEnabled || mAccount == null) return;
|
||||
- mChromeSyncEnabled = value;
|
||||
-
|
||||
- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
|
||||
- mSyncContentResolverDelegate.setSyncAutomatically(mAccount, mContractAuthority, value);
|
||||
- StrictMode.setThreadPolicy(oldPolicy);
|
||||
+ mChromeSyncEnabled = false;
|
||||
}
|
||||
notifyObservers();
|
||||
}
|
||||
@@ -299,19 +293,9 @@ public class AndroidSyncSettings {
|
||||
boolean oldChromeSyncEnabled = mChromeSyncEnabled;
|
||||
boolean oldMasterSyncEnabled = mMasterSyncEnabled;
|
||||
|
||||
- StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
|
||||
- if (mAccount != null) {
|
||||
- mIsSyncable =
|
||||
- mSyncContentResolverDelegate.getIsSyncable(mAccount, mContractAuthority)
|
||||
- == 1;
|
||||
- mChromeSyncEnabled = mSyncContentResolverDelegate.getSyncAutomatically(
|
||||
- mAccount, mContractAuthority);
|
||||
- } else {
|
||||
- mIsSyncable = false;
|
||||
- mChromeSyncEnabled = false;
|
||||
- }
|
||||
- mMasterSyncEnabled = mSyncContentResolverDelegate.getMasterSyncAutomatically();
|
||||
- StrictMode.setThreadPolicy(oldPolicy);
|
||||
+ mIsSyncable = false;
|
||||
+ mChromeSyncEnabled = false;
|
||||
+ mMasterSyncEnabled = false;
|
||||
|
||||
return oldChromeSyncEnabled != mChromeSyncEnabled
|
||||
|| oldMasterSyncEnabled != mMasterSyncEnabled;
|
||||
diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
|
||||
--- a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
|
||||
+++ b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
|
||||
@@ -96,50 +96,7 @@ public class HttpNegotiateAuthenticator {
|
||||
|
||||
@Override
|
||||
public void run(AccountManagerFuture<Account[]> future) {
|
||||
- Account[] accounts;
|
||||
- try {
|
||||
- accounts = future.getResult();
|
||||
- } catch (OperationCanceledException | AuthenticatorException | IOException e) {
|
||||
- Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to retrieve accounts.", e);
|
||||
- nativeSetResult(mRequestData.nativeResultObject, NetError.ERR_UNEXPECTED, null);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (accounts.length == 0) {
|
||||
- Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: No account provided for the kerberos "
|
||||
- + "authentication. Please verify the configuration policies and "
|
||||
- + "that the CONTACTS runtime permission is granted. ");
|
||||
- nativeSetResult(mRequestData.nativeResultObject,
|
||||
- NetError.ERR_MISSING_AUTH_CREDENTIALS, null);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (accounts.length > 1) {
|
||||
- Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: Found %d accounts eligible for the "
|
||||
- + "kerberos authentication. Please fix the configuration by "
|
||||
- + "providing a single account.",
|
||||
- accounts.length);
|
||||
- nativeSetResult(mRequestData.nativeResultObject,
|
||||
- NetError.ERR_MISSING_AUTH_CREDENTIALS, null);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (lacksPermission(ContextUtils.getApplicationContext(),
|
||||
- "android.permission.USE_CREDENTIALS", true)) {
|
||||
- // Protecting the AccountManager#getAuthToken call.
|
||||
- // API < 23 Requires the USE_CREDENTIALS permission or throws an exception.
|
||||
- // API >= 23 USE_CREDENTIALS permission is removed
|
||||
- Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: USE_CREDENTIALS permission not "
|
||||
- + "granted. Aborting authentication.");
|
||||
- nativeSetResult(mRequestData.nativeResultObject,
|
||||
- NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
|
||||
- return;
|
||||
- }
|
||||
- mRequestData.account = accounts[0];
|
||||
- mRequestData.accountManager.getAuthToken(mRequestData.account,
|
||||
- mRequestData.authTokenType, mRequestData.options, true /* notifyAuthFailure */,
|
||||
- new GetTokenCallback(mRequestData),
|
||||
- new Handler(ThreadUtils.getUiThreadLooper()));
|
||||
+ // account-based authentication removed for privacy-violations concerns
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,41 +109,7 @@ public class HttpNegotiateAuthenticator {
|
||||
|
||||
@Override
|
||||
public void run(AccountManagerFuture<Bundle> future) {
|
||||
- Bundle result;
|
||||
- try {
|
||||
- result = future.getResult();
|
||||
- } catch (OperationCanceledException | AuthenticatorException | IOException e) {
|
||||
- Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to obtain a token.", e);
|
||||
- nativeSetResult(mRequestData.nativeResultObject, NetError.ERR_UNEXPECTED, null);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (result.containsKey(AccountManager.KEY_INTENT)) {
|
||||
- final Context appContext = ContextUtils.getApplicationContext();
|
||||
-
|
||||
- // We wait for a broadcast that should be sent once the user is done interacting
|
||||
- // with the notification
|
||||
- // TODO(dgn) We currently hang around if the notification is swiped away, until
|
||||
- // a LOGIN_ACCOUNTS_CHANGED_ACTION filter is received. It might be for something
|
||||
- // unrelated then we would wait again here. Maybe we should limit the number of
|
||||
- // retries in some way?
|
||||
- BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
|
||||
-
|
||||
- @Override
|
||||
- public void onReceive(Context context, Intent intent) {
|
||||
- appContext.unregisterReceiver(this);
|
||||
- mRequestData.accountManager.getAuthToken(mRequestData.account,
|
||||
- mRequestData.authTokenType, mRequestData.options,
|
||||
- true /* notifyAuthFailure */, new GetTokenCallback(mRequestData),
|
||||
- null);
|
||||
- }
|
||||
-
|
||||
- };
|
||||
- appContext.registerReceiver(broadcastReceiver,
|
||||
- new IntentFilter(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION));
|
||||
- } else {
|
||||
- processResult(result, mRequestData);
|
||||
- }
|
||||
+ // ditto
|
||||
}
|
||||
}
|
||||
|
||||
@@ -299,22 +222,7 @@ public class HttpNegotiateAuthenticator {
|
||||
*/
|
||||
private void requestTokenWithoutActivity(
|
||||
Context ctx, RequestData requestData, String[] features) {
|
||||
- if (lacksPermission(ctx, Manifest.permission.GET_ACCOUNTS, true /* onlyPreM */)) {
|
||||
- // Protecting the AccountManager#getAccountsByTypeAndFeatures call.
|
||||
- // API < 23 Requires the GET_ACCOUNTS permission or throws an exception.
|
||||
- // API >= 23 Requires the GET_ACCOUNTS permission (CONTACTS permission group) or
|
||||
- // returns only the accounts whose authenticator has a signature that
|
||||
- // matches our app. Working with this restriction and not requesting
|
||||
- // the permission is a valid use case in the context of WebView, so we
|
||||
- // don't require it on M+
|
||||
- Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: GET_ACCOUNTS permission not "
|
||||
- + "granted. Aborting authentication.");
|
||||
- nativeSetResult(requestData.nativeResultObject,
|
||||
- NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
|
||||
- return;
|
||||
- }
|
||||
- requestData.accountManager.getAccountsByTypeAndFeatures(mAccountType, features,
|
||||
- new GetAccountsCallback(requestData), new Handler(ThreadUtils.getUiThreadLooper()));
|
||||
+ // ditto
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -333,29 +241,7 @@ public class HttpNegotiateAuthenticator {
|
||||
*/
|
||||
private void requestTokenWithActivity(
|
||||
Context ctx, Activity activity, RequestData requestData, String[] features) {
|
||||
- boolean isPreM = Build.VERSION.SDK_INT < Build.VERSION_CODES.M;
|
||||
- String permission = isPreM
|
||||
- ? "android.permission.MANAGE_ACCOUNTS"
|
||||
- : Manifest.permission.GET_ACCOUNTS;
|
||||
-
|
||||
- // Check if the AccountManager#getAuthTokenByFeatures call can be made.
|
||||
- // API < 23 Requires the MANAGE_ACCOUNTS permission.
|
||||
- // API >= 23 Requires the GET_ACCOUNTS permission to behave properly. When it's not granted,
|
||||
- // accounts not managed by the current application can't be retrieved. Depending
|
||||
- // on the authenticator implementation, it might prompt to create an account, but
|
||||
- // that won't be saved. This would be a bad user experience, so we also consider
|
||||
- // it a failure case.
|
||||
- if (lacksPermission(ctx, permission, isPreM)) {
|
||||
- Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: %s permission not granted. "
|
||||
- + "Aborting authentication", permission);
|
||||
- nativeSetResult(requestData.nativeResultObject,
|
||||
- NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- requestData.accountManager.getAuthTokenByFeatures(mAccountType, requestData.authTokenType,
|
||||
- features, activity, null, requestData.options, new GetTokenCallback(requestData),
|
||||
- new Handler(ThreadUtils.getUiThreadLooper()));
|
||||
+ // ditto
|
||||
}
|
||||
|
||||
/**
|
||||
diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
|
||||
--- a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
|
||||
+++ b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
|
||||
@@ -93,7 +93,6 @@ public class OAuthTokenFetcher {
|
||||
|
||||
/** Begins fetching a token. Should be called on the main thread. */
|
||||
public void fetch() {
|
||||
- fetchImpl(null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -102,7 +101,6 @@ public class OAuthTokenFetcher {
|
||||
* @param expiredToken A previously-fetched token which has expired.
|
||||
*/
|
||||
public void clearAndFetch(String expiredToken) {
|
||||
- fetchImpl(expiredToken);
|
||||
}
|
||||
|
||||
private void fetchImpl(final String expiredToken) {
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -11,7 +11,7 @@ Block gelocation by default instead of granting it for non-enterprise use cases
|
||||
diff --git a/chrome/browser/android/search_permissions/search_permissions_service.cc b/chrome/browser/android/search_permissions/search_permissions_service.cc
|
||||
--- a/chrome/browser/android/search_permissions/search_permissions_service.cc
|
||||
+++ b/chrome/browser/android/search_permissions/search_permissions_service.cc
|
||||
@@ -343,11 +343,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
|
||||
@@ -333,11 +333,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
|
||||
pref_service_->ClearPref(prefs::kDSEWasDisabledByPolicy);
|
||||
|
||||
// Initialize the pref for geolocation if it hasn't been initialized yet.
|
||||
@@ -380,10 +376,8 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
|
||||
@@ -370,10 +366,8 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
|
||||
pref_service_->ClearPref(prefs::kDSEGeolocationSettingDeprecated);
|
||||
} else if (dse_geolocation_setting == CONTENT_SETTING_ASK) {
|
||||
// If the user hasn't explicitly allowed or blocked geolocation for the
|
||||
@@ -37,7 +37,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
|
||||
}
|
||||
|
||||
// Update the content setting with the auto-grants for the DSE.
|
||||
@@ -409,11 +403,9 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
|
||||
@@ -398,11 +392,9 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
|
||||
GetContentSetting(dse_origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
|
||||
ContentSetting dse_notifications_setting = notifications_setting_to_restore;
|
||||
// If the user hasn't explicitly allowed or blocked notifications for the
|
||||
@@ -54,15 +54,15 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
|
||||
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||||
--- a/chrome/common/chrome_features.cc
|
||||
+++ b/chrome/common/chrome_features.cc
|
||||
@@ -296,7 +296,7 @@ const base::Feature kGeoLanguage{"GeoLanguage",
|
||||
|
||||
@@ -242,7 +242,7 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList";
|
||||
#if defined(OS_ANDROID)
|
||||
const base::Feature kGrantNotificationsToDSE{"GrantNotificationsToDSE",
|
||||
// Enable changing default downloads storage location on Android.
|
||||
const base::Feature kDownloadsLocationChange{"DownloadsLocationChange",
|
||||
- base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
+ base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
#endif // defined(OS_ANDROID)
|
||||
#endif
|
||||
|
||||
#if defined(OS_CHROMEOS)
|
||||
// Show the number of open incognito windows besides incognito icon on the
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Do not store passwords by default
|
||||
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
|
||||
--- a/components/password_manager/core/browser/password_manager.cc
|
||||
+++ b/components/password_manager/core/browser/password_manager.cc
|
||||
@@ -333,10 +333,10 @@ void RecordParsingOnSavingDifference(
|
||||
@@ -354,10 +354,10 @@ bool IsOnlyNewParserEnabled() {
|
||||
void PasswordManager::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
|
||||
@@ -42,7 +42,7 @@ Excerpt from https://github.com/bromite/bromite/issues/226
|
||||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -268,6 +268,10 @@ config("compiler") {
|
||||
@@ -262,6 +262,10 @@ config("compiler") {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ Set #enable-history-entry-requires-user-gesture to enabled by default
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -1323,7 +1323,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -1133,7 +1133,7 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
{"enable-history-entry-requires-user-gesture",
|
||||
flag_descriptions::kHistoryRequiresUserGestureName,
|
||||
flag_descriptions::kHistoryRequiresUserGestureDescription, kOsAll,
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Sun, 14 Apr 2019 12:02:57 +0200
|
||||
Subject: Enable night mode menu entry by default
|
||||
|
||||
---
|
||||
chrome/browser/android/chrome_feature_list.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
|
||||
--- a/chrome/browser/android/chrome_feature_list.cc
|
||||
+++ b/chrome/browser/android/chrome_feature_list.cc
|
||||
@@ -230,7 +230,7 @@ const base::Feature kAdjustWebApkInstallationSpace = {
|
||||
"AdjustWebApkInstallationSpace", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
|
||||
const base::Feature kAndroidNightMode{"AndroidNightMode",
|
||||
- base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
+ base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
|
||||
const base::Feature kAndroidNightModeCCT{"AndroidNightModeCCT",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,49 +1,23 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Fri, 15 Mar 2019 10:05:14 +0100
|
||||
Subject: Enable secure DNS mode by default in DnsTransaction.
|
||||
Subject: Enable secure DNS mode by default in DnsTransaction
|
||||
|
||||
---
|
||||
chrome/browser/net/dns_probe_runner.cc | 2 +-
|
||||
components/certificate_transparency/log_dns_client.cc | 2 +-
|
||||
net/dns/host_resolver_impl.cc | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
net/dns/host_resolver_manager.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/chrome/browser/net/dns_probe_runner.cc b/chrome/browser/net/dns_probe_runner.cc
|
||||
--- a/chrome/browser/net/dns_probe_runner.cc
|
||||
+++ b/chrome/browser/net/dns_probe_runner.cc
|
||||
@@ -110,7 +110,7 @@ void DnsProbeRunner::RunProbe(const base::Closure& callback) {
|
||||
kKnownGoodHostname, net::dns_protocol::kTypeA,
|
||||
base::Bind(&DnsProbeRunner::OnTransactionComplete,
|
||||
weak_factory_.GetWeakPtr()),
|
||||
- NetLogWithSource(), net::SecureDnsMode::AUTOMATIC);
|
||||
+ NetLogWithSource(), net::SecureDnsMode::SECURE);
|
||||
|
||||
transaction_->Start();
|
||||
}
|
||||
diff --git a/components/certificate_transparency/log_dns_client.cc b/components/certificate_transparency/log_dns_client.cc
|
||||
--- a/components/certificate_transparency/log_dns_client.cc
|
||||
+++ b/components/certificate_transparency/log_dns_client.cc
|
||||
@@ -472,7 +472,7 @@ bool AuditProofQueryImpl::StartDnsTransaction(const std::string& qname) {
|
||||
qname, net::dns_protocol::kTypeTXT,
|
||||
base::BindOnce(&AuditProofQueryImpl::OnDnsTransactionComplete,
|
||||
weak_ptr_factory_.GetWeakPtr()),
|
||||
- net_log_, net::SecureDnsMode::AUTOMATIC);
|
||||
+ net_log_, net::SecureDnsMode::SECURE);
|
||||
|
||||
current_dns_transaction_->Start();
|
||||
return true;
|
||||
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
|
||||
--- a/net/dns/host_resolver_impl.cc
|
||||
+++ b/net/dns/host_resolver_impl.cc
|
||||
@@ -1066,7 +1066,7 @@ class HostResolverImpl::DnsTask : public base::SupportsWeakPtr<DnsTask> {
|
||||
base::BindOnce(&DnsTask::OnTransactionComplete,
|
||||
base::Unretained(this), tick_clock_->NowTicks(),
|
||||
dns_query_type),
|
||||
- net_log_, SecureDnsMode::AUTOMATIC);
|
||||
+ net_log_, SecureDnsMode::SECURE);
|
||||
trans->SetRequestContext(delegate_->url_request_context());
|
||||
trans->SetRequestPriority(delegate_->priority());
|
||||
return trans;
|
||||
diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
|
||||
--- a/net/dns/host_resolver_manager.cc
|
||||
+++ b/net/dns/host_resolver_manager.cc
|
||||
@@ -1001,7 +1001,7 @@ class HostResolverManager::DnsTask : public base::SupportsWeakPtr<DnsTask> {
|
||||
std::unique_ptr<DnsTransaction> CreateTransaction(
|
||||
DnsQueryType dns_query_type) {
|
||||
DCHECK_NE(DnsQueryType::UNSPECIFIED, dns_query_type);
|
||||
- SecureDnsMode secure_dns_mode = SecureDnsMode::AUTOMATIC;
|
||||
+ SecureDnsMode secure_dns_mode = SecureDnsMode::SECURE;
|
||||
// Downgrade to OFF mode if the query name for this attempt matches one of
|
||||
// the DoH server names. This is needed to prevent infinite recursion.
|
||||
DCHECK(client_->GetConfig());
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
+4
-4
@@ -9,8 +9,8 @@ Subject: Enable site per process isolation for devices with enough memory
|
||||
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||||
--- a/chrome/common/chrome_features.cc
|
||||
+++ b/chrome/common/chrome_features.cc
|
||||
@@ -518,11 +518,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
|
||||
// (e.g. this approach lets ChromeCast avoid site-per-process mode).
|
||||
@@ -558,11 +558,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
|
||||
// browser_features, as they are only used on the browser side.
|
||||
const base::Feature kSitePerProcess {
|
||||
"site-per-process",
|
||||
-#if defined(OS_ANDROID)
|
||||
@@ -20,8 +20,8 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
|
||||
-#endif
|
||||
};
|
||||
|
||||
// kSitePerProcessOnlyForHighMemoryClients is checked before kSitePerProcess,
|
||||
@@ -535,7 +531,7 @@ const base::Feature kSitePerProcess {
|
||||
// Controls a mode for dynamically process-isolating sites where the user has
|
||||
@@ -584,7 +580,7 @@ const base::Feature kSiteIsolationForPasswordSites{
|
||||
// base::SysInfo::AmountOfPhysicalMemoryMB().
|
||||
const base::Feature kSitePerProcessOnlyForHighMemoryClients{
|
||||
"site-per-process-only-for-high-memory-clients",
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Fix crash when accessing page info / site settings
|
||||
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
|
||||
--- a/chrome/browser/permissions/permission_manager.cc
|
||||
+++ b/chrome/browser/permissions/permission_manager.cc
|
||||
@@ -694,6 +694,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
|
||||
@@ -695,6 +695,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
|
||||
if (status != CONTENT_SETTING_DEFAULT)
|
||||
return PermissionResult(status, PermissionStatusSource::UNSPECIFIED);
|
||||
PermissionContextBase* context = GetPermissionContext(permission);
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Hide passwords manager link
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
|
||||
@@ -249,7 +249,7 @@ public class SavePasswordsPreferences
|
||||
@@ -251,7 +251,7 @@ public class SavePasswordsPreferences
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pas
|
||||
|
||||
PreferenceGroup passwordParent;
|
||||
if (mSearchQuery == null) {
|
||||
@@ -324,7 +324,7 @@ public class SavePasswordsPreferences
|
||||
@@ -326,7 +326,7 @@ public class SavePasswordsPreferences
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ Send a random key press to circumvent idle status detection
|
||||
diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
|
||||
--- a/third_party/blink/renderer/core/dom/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/core/dom/BUILD.gn
|
||||
@@ -150,6 +150,8 @@ blink_core_sources("dom") {
|
||||
@@ -146,6 +146,8 @@ blink_core_sources("dom") {
|
||||
"global_event_handlers.h",
|
||||
"icon_url.cc",
|
||||
"icon_url.h",
|
||||
@@ -32,15 +32,15 @@ diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/re
|
||||
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
|
||||
--- a/third_party/blink/renderer/core/dom/document.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/document.cc
|
||||
@@ -236,6 +236,7 @@
|
||||
@@ -241,6 +241,7 @@
|
||||
#include "third_party/blink/renderer/core/page/scrolling/root_scroller_controller.h"
|
||||
#include "third_party/blink/renderer/core/page/scrolling/scroll_state_callback.h"
|
||||
#include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
|
||||
+#include "extensions/video_bg_play.h"
|
||||
#include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
|
||||
#include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
|
||||
+#include "extensions/video_bg_play.h"
|
||||
#include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h"
|
||||
#include "third_party/blink/renderer/core/paint/first_meaningful_paint_detector.h"
|
||||
#include "third_party/blink/renderer/core/paint/paint_layer.h"
|
||||
@@ -296,6 +297,8 @@
|
||||
#include "third_party/blink/renderer/core/page/spatial_navigation_controller.h"
|
||||
@@ -305,6 +306,8 @@
|
||||
#include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
|
||||
#include "third_party/blink/renderer/platform/wtf/time.h"
|
||||
|
||||
@@ -49,7 +49,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
|
||||
#ifndef NDEBUG
|
||||
using WeakDocumentSet = blink::HeapHashSet<blink::WeakMember<blink::Document>>;
|
||||
static WeakDocumentSet& liveDocumentSet();
|
||||
@@ -6199,8 +6202,35 @@ void Document::FinishedParsing() {
|
||||
@@ -6106,8 +6109,35 @@ void Document::FinishedParsing() {
|
||||
// Parser should have picked up all preloads by now
|
||||
fetcher_->ClearPreloads(ResourceFetcher::kClearSpeculativeMarkupPreloads);
|
||||
|
||||
@@ -111,7 +111,7 @@ new file mode 100644
|
||||
diff --git a/third_party/blink/renderer/core/html/html_script_element.cc b/third_party/blink/renderer/core/html/html_script_element.cc
|
||||
--- a/third_party/blink/renderer/core/html/html_script_element.cc
|
||||
+++ b/third_party/blink/renderer/core/html/html_script_element.cc
|
||||
@@ -155,6 +155,11 @@ void HTMLScriptElement::setTextContent(
|
||||
@@ -154,6 +154,11 @@ void HTMLScriptElement::setTextContent(
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Modify default preferences
|
||||
chrome/browser/net/prediction_options.h | 2 +-
|
||||
chrome/browser/profiles/profile.cc | 2 +-
|
||||
.../settings/reset_page/reset_profile_dialog.html | 2 +-
|
||||
chrome/browser/signin/signin_promo.cc | 4 ++--
|
||||
chrome/browser/signin/signin_promo.cc | 2 +-
|
||||
chrome/browser/ui/browser_ui_prefs.cc | 4 ++--
|
||||
chrome/browser/ui/navigation_correction_tab_observer.cc | 2 +-
|
||||
.../browser/ui/webui/local_discovery/local_discovery_ui.cc | 4 ----
|
||||
@@ -19,12 +19,12 @@ Subject: Modify default preferences
|
||||
components/bookmarks/browser/bookmark_utils.cc | 4 ++--
|
||||
components/safe_browsing/common/safe_browsing_prefs.cc | 4 ++--
|
||||
extensions/common/extension.cc | 8 --------
|
||||
16 files changed, 23 insertions(+), 41 deletions(-)
|
||||
16 files changed, 22 insertions(+), 40 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
|
||||
--- a/chrome/browser/background/background_mode_manager.cc
|
||||
+++ b/chrome/browser/background/background_mode_manager.cc
|
||||
@@ -351,7 +351,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
|
||||
@@ -352,7 +352,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
|
||||
registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
|
||||
registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
|
||||
#endif
|
||||
@@ -36,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
|
||||
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -1098,7 +1098,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
|
||||
@@ -1139,7 +1139,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
|
||||
void ChromeContentBrowserClient::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
|
||||
@@ -72,7 +72,7 @@ diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/predic
|
||||
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
|
||||
--- a/chrome/browser/profiles/profile.cc
|
||||
+++ b/chrome/browser/profiles/profile.cc
|
||||
@@ -138,7 +138,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
|
||||
@@ -148,7 +148,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
|
||||
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
prefs::kSearchSuggestEnabled,
|
||||
@@ -96,13 +96,11 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h
|
||||
diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
|
||||
--- a/chrome/browser/signin/signin_promo.cc
|
||||
+++ b/chrome/browser/signin/signin_promo.cc
|
||||
@@ -291,8 +291,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
|
||||
@@ -172,7 +172,7 @@ bool IsAutoCloseEnabledInEmbeddedURL(const GURL& url) {
|
||||
|
||||
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);
|
||||
registry->RegisterIntegerPref(prefs::kDiceSigninUserMenuPromoCount, 0);
|
||||
@@ -110,7 +108,7 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi
|
||||
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
|
||||
--- a/chrome/browser/ui/browser_ui_prefs.cc
|
||||
+++ b/chrome/browser/ui/browser_ui_prefs.cc
|
||||
@@ -68,11 +68,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
@@ -66,11 +66,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
|
||||
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
|
||||
registry->RegisterBooleanPref(
|
||||
@@ -127,12 +125,12 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
|
||||
diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
|
||||
--- a/chrome/browser/ui/navigation_correction_tab_observer.cc
|
||||
+++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
|
||||
@@ -56,7 +56,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
|
||||
@@ -55,7 +55,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {}
|
||||
// static
|
||||
void NavigationCorrectionTabObserver::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* prefs) {
|
||||
prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
|
||||
- true,
|
||||
+ false,
|
||||
- prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true,
|
||||
+ prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, false,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
}
|
||||
|
||||
@@ -165,7 +163,7 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c
|
||||
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
|
||||
--- a/components/autofill/core/browser/autofill_manager.cc
|
||||
+++ b/components/autofill/core/browser/autofill_manager.cc
|
||||
@@ -356,10 +356,7 @@ bool AutofillManager::ShouldParseForms(const std::vector<FormData>& forms,
|
||||
@@ -360,10 +360,7 @@ bool AutofillManager::ShouldParseForms(const std::vector<FormData>& forms,
|
||||
bool enabled = IsAutofillEnabled();
|
||||
sync_state_ = personal_data_ ? personal_data_->GetSyncSigninState()
|
||||
: AutofillSyncSigninState::kNumSyncStates;
|
||||
@@ -177,7 +175,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
|
||||
|
||||
return enabled;
|
||||
}
|
||||
@@ -627,10 +624,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
|
||||
@@ -626,10 +623,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
|
||||
// suggestions available.
|
||||
// TODO(mathp): Differentiate between number of suggestions available
|
||||
// (current metric) and number shown to the user.
|
||||
@@ -189,7 +187,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1237,8 +1231,8 @@ void AutofillManager::Reset() {
|
||||
@@ -1234,8 +1228,8 @@ void AutofillManager::Reset() {
|
||||
#if defined(OS_ANDROID) || defined(OS_IOS)
|
||||
autofill_assistant_.Reset();
|
||||
#endif
|
||||
@@ -203,9 +201,9 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
|
||||
diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
|
||||
--- a/components/autofill/core/common/autofill_prefs.cc
|
||||
+++ b/components/autofill/core/common/autofill_prefs.cc
|
||||
@@ -137,10 +137,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
prefs::kAutofillBillingCustomerNumber, 0.0,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
|
||||
@@ -130,10 +130,10 @@ const char kAutocompleteLastVersionRetentionPolicy[] =
|
||||
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
// Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
|
||||
registry->RegisterBooleanPref(
|
||||
- prefs::kAutofillEnabledDeprecated, true,
|
||||
+ prefs::kAutofillEnabledDeprecated, false,
|
||||
@@ -216,7 +214,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
registry->RegisterIntegerPref(
|
||||
prefs::kAutofillLastVersionDeduped, 0,
|
||||
@@ -153,7 +153,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
@@ -146,7 +146,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
|
||||
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
||||
registry->RegisterBooleanPref(
|
||||
@@ -261,7 +259,7 @@ diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components
|
||||
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
|
||||
--- a/extensions/common/extension.cc
|
||||
+++ b/extensions/common/extension.cc
|
||||
@@ -367,14 +367,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
|
||||
@@ -382,14 +382,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
|
||||
if (is_theme())
|
||||
return false;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Never send any crash upload data
|
||||
diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
|
||||
--- a/chrome/browser/tracing/crash_service_uploader.cc
|
||||
+++ b/chrome/browser/tracing/crash_service_uploader.cc
|
||||
@@ -126,6 +126,9 @@ void TraceCrashServiceUploader::DoUpload(
|
||||
@@ -127,6 +127,9 @@ void TraceCrashServiceUploader::DoUpload(
|
||||
std::unique_ptr<const base::DictionaryValue> metadata,
|
||||
const UploadProgressCallback& progress_callback,
|
||||
UploadDoneCallback done_callback) {
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Offer builtin autocomplete for chrome://flags
|
||||
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
||||
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
||||
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
||||
@@ -235,6 +235,8 @@ std::vector<base::string16>
|
||||
@@ -234,6 +234,8 @@ std::vector<base::string16>
|
||||
ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
|
||||
std::vector<base::string16> builtins_to_provide;
|
||||
builtins_to_provide.push_back(
|
||||
|
||||
@@ -9,10 +9,10 @@ Subject: Open YouTube links in Bromite
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
|
||||
@@ -401,6 +401,13 @@ public class ExternalNavigationHandler {
|
||||
return OverrideUrlLoadingResult.NO_OVERRIDE;
|
||||
@@ -400,6 +400,13 @@ public class ExternalNavigationHandler {
|
||||
}
|
||||
|
||||
// TODO(changwan): check if we need to handle URL even when external intent is off.
|
||||
+ // Force to open YouTube urls in Bromite
|
||||
+ String intentPackageName = intent.getPackage();
|
||||
+ if (intentPackageName != null && intentPackageName.equals("com.google.android.youtube")) {
|
||||
@@ -20,9 +20,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext
|
||||
+ return OverrideUrlLoadingResult.NO_OVERRIDE;
|
||||
+ }
|
||||
+
|
||||
// Sanitize the Intent, ensuring web pages can not bypass browser
|
||||
// security (only access to BROWSABLE activities).
|
||||
intent.addCategory(Intent.CATEGORY_BROWSABLE);
|
||||
if (CommandLine.getInstance().hasSwitch(
|
||||
ChromeSwitches.DISABLE_EXTERNAL_INTENT_REQUESTS)) {
|
||||
Log.w(TAG, "External intent handling is disabled by a command-line flag.");
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromi
|
||||
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
|
||||
--- a/chrome/common/chrome_content_client.cc
|
||||
+++ b/chrome/common/chrome_content_client.cc
|
||||
@@ -518,7 +518,7 @@ void ChromeContentClient::AddContentDecryptionModules(
|
||||
@@ -520,7 +520,7 @@ void ChromeContentClient::AddContentDecryptionModules(
|
||||
base::FilePath cdm_path;
|
||||
content::CdmCapability capability;
|
||||
if (IsWidevineAvailable(&cdm_path, &capability)) {
|
||||
|
||||
+10
-10
@@ -1,6 +1,6 @@
|
||||
From: Serg <serg.zhukovsky@gmail.com>
|
||||
Date: Wed, 22 Mar 2017 19:10:30 -0400
|
||||
Subject: Remove Sync and Translate menu
|
||||
Subject: Remove background sync and translate menu options
|
||||
|
||||
---
|
||||
.../java/res/drawable-hdpi/settings_translate.png | Bin 399 -> 0 bytes
|
||||
@@ -177,19 +177,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
||||
} else {
|
||||
// If both Autoplay and Protected Content menus are available, they'll be tucked under
|
||||
// the Media key. Otherwise, we can remove the Media menu entry.
|
||||
@@ -108,11 +106,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
||||
if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
|
||||
getPreferenceScreen().removePreference(findPreference(Type.CLIPBOARD));
|
||||
@@ -102,11 +100,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
||||
if (!SiteSettingsCategory.adsCategoryEnabled()) {
|
||||
getPreferenceScreen().removePreference(findPreference(Type.ADS));
|
||||
}
|
||||
- // The new Languages Preference *feature* is an advanced version of this translate
|
||||
- // preference. Once Languages Preference is enabled, remove this setting.
|
||||
- if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
|
||||
- getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
|
||||
- }
|
||||
if (!ChromeFeatureList.isEnabled(ChromeFeatureList.GENERIC_SENSOR_EXTRA_CLASSES)) {
|
||||
if (!ChromeFeatureList.isEnabled(ChromeFeatureList.SENSOR_CONTENT_SETTING)) {
|
||||
getPreferenceScreen().removePreference(findPreference(Type.SENSORS));
|
||||
}
|
||||
@@ -122,10 +115,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
||||
@@ -116,10 +109,6 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
||||
private void updatePreferenceStates() {
|
||||
PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
|
||||
|
||||
@@ -200,16 +200,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
|
||||
// Preferences that navigate to Website Settings.
|
||||
List<Integer> websitePrefs = new ArrayList<Integer>();
|
||||
if (mMediaSubMenu) {
|
||||
@@ -142,7 +131,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
||||
@@ -136,7 +125,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
||||
if (!mProtectedContentMenuAvailable) {
|
||||
websitePrefs.add(Type.AUTOPLAY);
|
||||
}
|
||||
- websitePrefs.add(Type.BACKGROUND_SYNC);
|
||||
+// websitePrefs.add(Type.BACKGROUND_SYNC);
|
||||
websitePrefs.add(Type.CAMERA);
|
||||
if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
|
||||
websitePrefs.add(Type.CLIPBOARD);
|
||||
@@ -241,11 +230,4 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
||||
websitePrefs.add(Type.CLIPBOARD);
|
||||
websitePrefs.add(Type.COOKIES);
|
||||
@@ -232,11 +221,4 @@ public class SiteSettingsPreferences extends PreferenceFragment
|
||||
preference.getTitle().toString());
|
||||
return false;
|
||||
}
|
||||
@@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
||||
@@ -2165,15 +2165,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
@@ -2177,15 +2177,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
|
||||
|
||||
final Tab currentTab = getActivityTab();
|
||||
|
||||
@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
@@ -865,7 +865,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
|
||||
@@ -752,7 +752,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
|
||||
public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
|
||||
// Disable creating new tabs, bookmark, history, print, help, focus_url, etc.
|
||||
if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id
|
||||
|
||||
@@ -0,0 +1,180 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Wed, 15 May 2019 17:08:35 +0200
|
||||
Subject: Remove recent tabs signin
|
||||
|
||||
---
|
||||
.../chrome/browser/signin/SigninManager.java | 74 ++--------------------
|
||||
1 file changed, 7 insertions(+), 67 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
|
||||
@@ -29,11 +29,7 @@ import org.chromium.base.metrics.RecordUserAction;
|
||||
import org.chromium.base.task.PostTask;
|
||||
import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
|
||||
import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
|
||||
-import org.chromium.components.signin.AccountIdProvider;
|
||||
import org.chromium.components.signin.AccountManagerFacade;
|
||||
-import org.chromium.components.signin.AccountTrackerService;
|
||||
-import org.chromium.components.signin.ChromeSigninController;
|
||||
-import org.chromium.components.sync.AndroidSyncSettings;
|
||||
import org.chromium.content_public.browser.UiThreadTaskTraits;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -49,7 +45,7 @@ import java.util.List;
|
||||
* <p/>
|
||||
* See chrome/browser/signin/signin_manager_android.h for more details.
|
||||
*/
|
||||
-public class SigninManager implements AccountTrackerService.OnSystemAccountsSeededListener {
|
||||
+public class SigninManager {
|
||||
private static final String TAG = "SigninManager";
|
||||
|
||||
/**
|
||||
@@ -182,8 +178,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
|
||||
private final long mNativeSigninManagerAndroid;
|
||||
private final Context mContext;
|
||||
- private final AccountTrackerService mAccountTrackerService;
|
||||
- private final AndroidSyncSettings mAndroidSyncSettings;
|
||||
private final ObserverList<SignInStateObserver> mSignInStateObservers = new ObserverList<>();
|
||||
private final ObserverList<SignInAllowedObserver> mSignInAllowedObservers =
|
||||
new ObserverList<>();
|
||||
@@ -227,26 +221,18 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
}
|
||||
|
||||
private SigninManager() {
|
||||
- this(ContextUtils.getApplicationContext(),
|
||||
- IdentityServicesProvider.getAccountTrackerService(), AndroidSyncSettings.get());
|
||||
+ this(ContextUtils.getApplicationContext());
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
- SigninManager(Context context, AccountTrackerService accountTrackerService,
|
||||
- AndroidSyncSettings androidSyncSettings) {
|
||||
+ SigninManager(Context context) {
|
||||
ThreadUtils.assertOnUiThread();
|
||||
assert context != null;
|
||||
- assert accountTrackerService != null;
|
||||
- assert androidSyncSettings != null;
|
||||
mContext = context;
|
||||
- mAccountTrackerService = accountTrackerService;
|
||||
- mAndroidSyncSettings = androidSyncSettings;
|
||||
|
||||
mNativeSigninManagerAndroid = SigninManagerJni.get().init(this);
|
||||
mSigninAllowedByPolicy =
|
||||
SigninManagerJni.get().isSigninAllowedByPolicy(this, mNativeSigninManagerAndroid);
|
||||
-
|
||||
- mAccountTrackerService.addSystemAccountsSeededListener(this);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -282,8 +268,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
* Returns true if signin can be started now.
|
||||
*/
|
||||
public boolean isSignInAllowed() {
|
||||
- return !mFirstRunCheckIsPending && mSignInState == null && mSigninAllowedByPolicy
|
||||
- && ChromeSigninController.get().getSignedInUser() == null && isSigninSupported();
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -298,15 +283,14 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
* Google Play Services installed.
|
||||
*/
|
||||
public boolean isSigninSupported() {
|
||||
- return !ApiCompatibilityUtils.isDemoUser(mContext)
|
||||
- && !ExternalAuthUtils.getInstance().isGooglePlayServicesMissing(mContext);
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether force sign-in is enabled by policy.
|
||||
*/
|
||||
public boolean isForceSigninEnabled() {
|
||||
- return SigninManagerJni.get().isForceSigninEnabled(this, mNativeSigninManagerAndroid);
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -340,27 +324,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
}
|
||||
|
||||
/**
|
||||
- * Continue pending sign in after system accounts have been seeded into AccountTrackerService.
|
||||
- */
|
||||
- @Override
|
||||
- public void onSystemAccountsSeedingComplete() {
|
||||
- if (mSignInState != null && mSignInState.mBlockedOnAccountSeeding) {
|
||||
- mSignInState.mBlockedOnAccountSeeding = false;
|
||||
- progressSignInFlowCheckPolicy();
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * Clear pending sign in when system accounts in AccountTrackerService were refreshed.
|
||||
- */
|
||||
- @Override
|
||||
- public void onSystemAccountsChanged() {
|
||||
- if (mSignInState != null) {
|
||||
- abortSignIn();
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
* Starts the sign-in flow, and executes the callback when finished.
|
||||
*
|
||||
* If an activity is provided, it is considered an "interactive" sign-in and the user can be
|
||||
@@ -415,19 +378,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
}
|
||||
|
||||
private void progressSignInFlowSeedSystemAccounts() {
|
||||
- if (mAccountTrackerService.checkAndSeedSystemAccounts()) {
|
||||
- progressSignInFlowCheckPolicy();
|
||||
- } else if (AccountIdProvider.getInstance().canBeUsed()) {
|
||||
- mSignInState.mBlockedOnAccountSeeding = true;
|
||||
- } else {
|
||||
- Activity activity = mSignInState.mActivity;
|
||||
- UserRecoverableErrorHandler errorHandler = activity != null
|
||||
- ? new UserRecoverableErrorHandler.ModalDialog(activity, !isForceSigninEnabled())
|
||||
- : new UserRecoverableErrorHandler.SystemNotification();
|
||||
- ExternalAuthUtils.getInstance().canUseGooglePlayServices(errorHandler);
|
||||
- Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
|
||||
- abortSignIn();
|
||||
- }
|
||||
+ mSignInState.mBlockedOnAccountSeeding = true;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -493,12 +444,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
SigninManagerJni.get().onSignInCompleted(
|
||||
this, mNativeSigninManagerAndroid, mSignInState.mAccount.name);
|
||||
|
||||
- // Cache the signed-in account name. This must be done after the native call, otherwise
|
||||
- // sync tries to start without being signed in natively and crashes.
|
||||
- ChromeSigninController.get().setSignedInAccountName(mSignInState.mAccount.name);
|
||||
- mAndroidSyncSettings.updateAccount(mSignInState.mAccount);
|
||||
- mAndroidSyncSettings.enableChromeSync();
|
||||
-
|
||||
if (mSignInState.mCallback != null) {
|
||||
mSignInState.mCallback.onSignInComplete();
|
||||
}
|
||||
@@ -674,16 +619,11 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
|
||||
// Should be set at beginning of sign-out flow.
|
||||
assert mSignOutState != null;
|
||||
|
||||
- ChromeSigninController.get().setSignedInAccountName(null);
|
||||
- mAndroidSyncSettings.updateAccount(null);
|
||||
-
|
||||
if (mSignOutState.mManagementDomain != null) {
|
||||
wipeProfileData();
|
||||
} else {
|
||||
wipeGoogleServiceWorkerCaches();
|
||||
}
|
||||
-
|
||||
- mAccountTrackerService.invalidateAccountSeedStatus(true);
|
||||
}
|
||||
|
||||
private void wipeProfileData() {
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
From: SergeyZhukovsky <serg.zhukovsky@gmail.com>
|
||||
Date: Tue, 15 Aug 2017 15:33:16 -0400
|
||||
Subject: Remove request for account access permission on reboot
|
||||
|
||||
---
|
||||
chrome/android/BUILD.gn | 4 +---
|
||||
chrome/android/java/AndroidManifest.xml | 4 ++--
|
||||
2 files changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
+++ b/chrome/android/BUILD.gn
|
||||
@@ -997,8 +997,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
|
||||
resources = [
|
||||
"java/res_template/xml/file_paths.xml",
|
||||
"java/res_template/xml/launchershortcuts.xml",
|
||||
- "java/res_template/xml/searchable.xml",
|
||||
- "java/res_template/xml/syncadapter.xml",
|
||||
+ "java/res_template/xml/searchable.xml"
|
||||
]
|
||||
res_dir = "java/res_template"
|
||||
variables = [ "manifest_package=$manifest_package" ]
|
||||
@@ -1009,7 +1008,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
|
||||
"java/res_template/xml/file_paths.xml",
|
||||
"java/res_template/xml/launchershortcuts.xml",
|
||||
"java/res_template/xml/searchable.xml",
|
||||
- "java/res_template/xml/syncadapter.xml",
|
||||
]
|
||||
res_dir = "java/res_template"
|
||||
|
||||
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
||||
--- a/chrome/android/java/AndroidManifest.xml
|
||||
+++ b/chrome/android/java/AndroidManifest.xml
|
||||
@@ -914,14 +914,14 @@ by a child template that "extends" this file.
|
||||
</provider>
|
||||
|
||||
<!-- Sync adapter for browser invalidation. -->
|
||||
- <service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
|
||||
+ <!--<service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
|
||||
android:exported="false">
|
||||
<intent-filter>
|
||||
<action android:name="android.content.SyncAdapter" />
|
||||
</intent-filter>
|
||||
<meta-data android:name="android.content.SyncAdapter"
|
||||
android:resource="@xml/syncadapter" />
|
||||
- </service>
|
||||
+ </service>-->
|
||||
|
||||
<!-- Broadcast receiver that will be notified of account changes -->
|
||||
<receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -9,7 +9,7 @@ Subject: Restore classic new tab page
|
||||
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
|
||||
--- a/chrome/browser/search/search.cc
|
||||
+++ b/chrome/browser/search/search.cc
|
||||
@@ -154,16 +154,6 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
|
||||
@@ -160,16 +160,6 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
|
||||
bool ShouldDelayRemoteNTP(const GURL& search_provider_url, Profile* profile) {
|
||||
#if defined(OS_CHROMEOS)
|
||||
// On Chrome OS, if the session hasn't merged yet, we need to avoid loading
|
||||
@@ -190,8 +180,7 @@ struct NewTabURLDetails {
|
||||
@@ -196,8 +186,7 @@ struct NewTabURLDetails {
|
||||
|
||||
const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
|
||||
|
||||
|
||||
+94
-82
@@ -1,37 +1,40 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Tue, 29 Jan 2019 01:02:07 +0100
|
||||
Subject: Rollback android:minSdkVersion from 19 (KitKat) to 16 (JellyBean)
|
||||
Subject: Rollback android:minSdkVersion from 19 (KitKat) to 17 (JellyBean)
|
||||
|
||||
Use v4 ArrayMap for compatibility with v17
|
||||
|
||||
This reverts commit 9a48587dbd1988cf5066b454e7d09ae35d124366.
|
||||
---
|
||||
.../test/embedded_test_server/java/AndroidManifest.xml | 2 +-
|
||||
android_webview/tools/automated_ui_tests/java/AndroidManifest.xml | 2 +-
|
||||
base/android/jni_generator/AndroidManifest.xml | 2 +-
|
||||
build/android/AndroidManifest.xml | 2 +-
|
||||
build/android/gradle/android.jinja | 2 +-
|
||||
chrome/android/BUILD.gn | 8 ++++----
|
||||
chrome/android/java/res/layout/autofill_local_card_editor.xml | 4 ++--
|
||||
.../test/android/chrome_public_test_support/AndroidManifest.xml | 2 +-
|
||||
components/cronet/android/sample/AndroidManifest.xml | 3 +--
|
||||
components/cronet/android/sample/javatests/AndroidManifest.xml | 3 +--
|
||||
components/cronet/android/test/javaperftests/AndroidManifest.xml | 3 +--
|
||||
components/cronet/android/test/javatests/AndroidManifest.xml | 3 +--
|
||||
.../test/android/browsertests_apk/AndroidManifest.xml.jinja2 | 2 +-
|
||||
content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 | 2 +-
|
||||
content/shell/android/javatests/AndroidManifest.xml | 2 +-
|
||||
content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2 | 2 +-
|
||||
content/shell/android/shell_apk/AndroidManifest.xml.jinja2 | 2 +-
|
||||
docs/android_build_instructions.md | 2 +-
|
||||
mojo/public/java/system/javatests/AndroidManifest.xml | 2 +-
|
||||
net/android/unittest_support/AndroidManifest.xml | 2 +-
|
||||
net/test/android/javatests/AndroidManifest.xml | 2 +-
|
||||
remoting/android/java/AndroidManifest.xml.jinja2 | 2 +-
|
||||
remoting/android/javatests/AndroidManifest.xml.jinja2 | 2 +-
|
||||
testing/android/driver/java/AndroidManifest.xml | 2 +-
|
||||
testing/android/native_test/java/AndroidManifest.xml.jinja2 | 2 +-
|
||||
tools/android/audio_focus_grabber/java/AndroidManifest.xml | 2 +-
|
||||
tools/android/push_apps_to_background/AndroidManifest.xml | 2 +-
|
||||
27 files changed, 31 insertions(+), 35 deletions(-)
|
||||
.../test/embedded_test_server/java/AndroidManifest.xml | 2 +-
|
||||
.../tools/automated_ui_tests/java/AndroidManifest.xml | 2 +-
|
||||
base/android/jni_generator/AndroidManifest.xml | 2 +-
|
||||
build/android/AndroidManifest.xml | 2 +-
|
||||
build/android/gradle/android.jinja | 2 +-
|
||||
chrome/android/BUILD.gn | 6 +++---
|
||||
.../trustedwebactivityui/splashscreen/SplashImageHolder.java | 2 +-
|
||||
.../splashscreen/SplashScreenController.java | 10 +++++-----
|
||||
.../android/chrome_public_test_support/AndroidManifest.xml | 2 +-
|
||||
components/cronet/android/sample/AndroidManifest.xml | 3 +--
|
||||
components/cronet/android/sample/javatests/AndroidManifest.xml | 3 +--
|
||||
.../cronet/android/test/javaperftests/AndroidManifest.xml | 3 +--
|
||||
components/cronet/android/test/javatests/AndroidManifest.xml | 3 +--
|
||||
.../test/android/browsertests_apk/AndroidManifest.xml.jinja2 | 2 +-
|
||||
.../shell/android/browsertests_apk/AndroidManifest.xml.jinja2 | 2 +-
|
||||
content/shell/android/javatests/AndroidManifest.xml | 2 +-
|
||||
.../shell/android/linker_test_apk/AndroidManifest.xml.jinja2 | 2 +-
|
||||
content/shell/android/shell_apk/AndroidManifest.xml.jinja2 | 2 +-
|
||||
docs/android_build_instructions.md | 2 +-
|
||||
mojo/public/java/system/javatests/AndroidManifest.xml | 2 +-
|
||||
net/android/unittest_support/AndroidManifest.xml | 2 +-
|
||||
net/test/android/javatests/AndroidManifest.xml | 2 +-
|
||||
remoting/android/java/AndroidManifest.xml.jinja2 | 2 +-
|
||||
remoting/android/javatests/AndroidManifest.xml.jinja2 | 2 +-
|
||||
testing/android/driver/java/AndroidManifest.xml | 2 +-
|
||||
testing/android/native_test/java/AndroidManifest.xml.jinja2 | 2 +-
|
||||
tools/android/audio_focus_grabber/java/AndroidManifest.xml | 2 +-
|
||||
tools/android/push_apps_to_background/AndroidManifest.xml | 4 ++--
|
||||
28 files changed, 35 insertions(+), 39 deletions(-)
|
||||
|
||||
diff --git a/android_webview/test/embedded_test_server/java/AndroidManifest.xml b/android_webview/test/embedded_test_server/java/AndroidManifest.xml
|
||||
--- a/android_webview/test/embedded_test_server/java/AndroidManifest.xml
|
||||
@@ -41,7 +44,7 @@ diff --git a/android_webview/test/embedded_test_server/java/AndroidManifest.xml
|
||||
package="org.chromium.android_webview.test.support">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
|
||||
@@ -53,7 +56,7 @@ diff --git a/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml b
|
||||
android:versionName="1.0" >
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
||||
@@ -65,7 +68,7 @@ diff --git a/base/android/jni_generator/AndroidManifest.xml b/base/android/jni_g
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.jni.generator">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="24" />
|
||||
<application></application>
|
||||
|
||||
</manifest>
|
||||
@@ -77,7 +80,7 @@ diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.x
|
||||
package="org.dummy">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="24" />
|
||||
|
||||
</manifest>
|
||||
diff --git a/build/android/gradle/android.jinja b/build/android/gradle/android.jinja
|
||||
@@ -88,70 +91,72 @@ diff --git a/build/android/gradle/android.jinja b/build/android/gradle/android.j
|
||||
defaultConfig {
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
- minSdkVersion 19
|
||||
+ minSdkVersion 16
|
||||
+ minSdkVersion 17
|
||||
targetSdkVersion {{ target_sdk_version }}
|
||||
}
|
||||
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
+++ b/chrome/android/BUILD.gn
|
||||
@@ -68,7 +68,7 @@ jinja_template("chrome_public_android_manifest") {
|
||||
@@ -67,7 +67,7 @@ jinja_template("chrome_public_android_manifest") {
|
||||
output = chrome_public_android_manifest
|
||||
variables = chrome_public_jinja_variables
|
||||
variables += [
|
||||
- "min_sdk_version=19",
|
||||
+ "min_sdk_version=16",
|
||||
+ "min_sdk_version=17",
|
||||
"target_sdk_version=$android_sdk_version",
|
||||
]
|
||||
|
||||
@@ -1459,7 +1459,7 @@ template("chrome_public_apk_or_module_tmpl") {
|
||||
android_manifest = chrome_modern_public_android_manifest
|
||||
android_manifest_dep = ":chrome_modern_public_android_manifest"
|
||||
} else {
|
||||
- min_sdk_version = 19
|
||||
+ min_sdk_version = 16
|
||||
android_manifest = chrome_public_android_manifest
|
||||
android_manifest_dep = ":chrome_public_android_manifest"
|
||||
}
|
||||
@@ -1646,7 +1646,7 @@ jinja_template("chrome_public_test_apk_manifest") {
|
||||
}
|
||||
@@ -1831,7 +1831,7 @@ jinja_template("chrome_public_test_apk_manifest") {
|
||||
variables = default_chrome_public_jinja_variables
|
||||
variables += [
|
||||
"manifest_package=$test_manifest_package",
|
||||
- "min_sdk_version=19",
|
||||
+ "min_sdk_version=16",
|
||||
+ "min_sdk_version=17",
|
||||
"target_sdk_version=$android_sdk_version",
|
||||
]
|
||||
}
|
||||
@@ -1657,7 +1657,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
|
||||
@@ -1842,7 +1842,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
|
||||
output = chrome_public_test_vr_apk_manifest
|
||||
variables = chrome_public_jinja_variables
|
||||
variables += [
|
||||
- "min_sdk_version=19",
|
||||
+ "min_sdk_version=16",
|
||||
+ "min_sdk_version=17",
|
||||
"target_sdk_version=$android_sdk_version",
|
||||
]
|
||||
}
|
||||
diff --git a/chrome/android/java/res/layout/autofill_local_card_editor.xml b/chrome/android/java/res/layout/autofill_local_card_editor.xml
|
||||
--- a/chrome/android/java/res/layout/autofill_local_card_editor.xml
|
||||
+++ b/chrome/android/java/res/layout/autofill_local_card_editor.xml
|
||||
@@ -19,7 +19,7 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashImageHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashImageHolder.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashImageHolder.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashImageHolder.java
|
||||
@@ -7,7 +7,7 @@ package org.chromium.chrome.browser.browserservices.trustedwebactivityui.splashs
|
||||
import android.graphics.Bitmap;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.customtabs.CustomTabsSessionToken;
|
||||
-import android.util.ArrayMap;
|
||||
+import android.support.v4.util.ArrayMap;
|
||||
|
||||
<!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
|
||||
<EditText
|
||||
- tools:ignore="Autofill,LabelFor"
|
||||
+ tools:ignore="Autofill"
|
||||
android:id="@+id/credit_card_name_edit"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -40,7 +40,7 @@
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashScreenController.java b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashScreenController.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashScreenController.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashScreenController.java
|
||||
@@ -119,11 +119,11 @@ public class SplashScreenController implements InflationObserver, Destroyable {
|
||||
Method method = Activity.class.getDeclaredMethod("convertFromTranslucent");
|
||||
method.setAccessible(true);
|
||||
method.invoke(mActivity);
|
||||
- } catch (ReflectiveOperationException e) {
|
||||
- // Method not found or threw an exception.
|
||||
- mUmaRecorder.recordTranslucencyRemovalFailed();
|
||||
- assert false : "Failed to remove activity translucency reflectively";
|
||||
- Log.e(TAG, "Failed to remove activity translucency reflectively");
|
||||
+ } catch (Exception e) {
|
||||
+ // Method not found or threw an exception.
|
||||
+ mUmaRecorder.recordTranslucencyRemovalFailed();
|
||||
+ assert false : "Failed to remove activity translucency reflectively";
|
||||
+ Log.e(TAG, "Failed to remove activity translucency reflectively:", e);
|
||||
}
|
||||
}
|
||||
|
||||
<!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
|
||||
<EditText
|
||||
- tools:ignore="Autofill,LabelFor"
|
||||
+ tools:ignore="Autofill"
|
||||
android:id="@+id/credit_card_number_edit"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
diff --git a/chrome/test/android/chrome_public_test_support/AndroidManifest.xml b/chrome/test/android/chrome_public_test_support/AndroidManifest.xml
|
||||
--- a/chrome/test/android/chrome_public_test_support/AndroidManifest.xml
|
||||
+++ b/chrome/test/android/chrome_public_test_support/AndroidManifest.xml
|
||||
@@ -160,7 +165,7 @@ diff --git a/chrome/test/android/chrome_public_test_support/AndroidManifest.xml
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="org.chromium.chrome.tests.support">
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="22" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="22" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<application>
|
||||
<service android:name="org.chromium.chrome.browser.media.TestMediaRouteProviderService"
|
||||
@@ -224,7 +229,7 @@ diff --git a/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
|
||||
package="org.chromium.components_browsertests_apk">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
@@ -236,7 +241,7 @@ diff --git a/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 b
|
||||
package="org.chromium.content_browsertests_apk">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
@@ -248,7 +253,7 @@ diff --git a/content/shell/android/javatests/AndroidManifest.xml b/content/shell
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.chromium.content_shell_apk.tests">
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
<uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
|
||||
<!-- We add an application tag here just so that we can indicate that this
|
||||
package needs to link against the android.test library, which is
|
||||
@@ -260,7 +265,7 @@ diff --git a/content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2 b/
|
||||
package="org.chromium.chromium_linker_test_apk">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
@@ -272,7 +277,7 @@ diff --git a/content/shell/android/shell_apk/AndroidManifest.xml.jinja2 b/conten
|
||||
package="org.chromium.content_shell_apk">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
<uses-permission android:name="android.permission.CAMERA"/>
|
||||
@@ -284,7 +289,7 @@ diff --git a/docs/android_build_instructions.md b/docs/android_build_instruction
|
||||
|
||||
1. `chrome_public_apk` (ChromePublic.apk)
|
||||
- * `minSdkVersion=19` (KitKat).
|
||||
+ * `minSdkVersion=16` (Jelly Bean).
|
||||
+ * `minSdkVersion=17` (Jelly Bean).
|
||||
* Stores libchrome.so compressed within the APK.
|
||||
* Uses [Crazy Linker](https://cs.chromium.org/chromium/src/base/android/linker/BUILD.gn?rcl=6bb29391a86f2be58c626170156cbfaa2cbc5c91&l=9).
|
||||
* Shipped only for Android < 21, but still works fine on Android >= 21.
|
||||
@@ -308,7 +313,7 @@ diff --git a/net/android/unittest_support/AndroidManifest.xml b/net/android/unit
|
||||
android:versionName="1.0">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
|
||||
@@ -320,7 +325,7 @@ diff --git a/net/test/android/javatests/AndroidManifest.xml b/net/test/android/j
|
||||
package="org.chromium.net.test.support">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
|
||||
@@ -356,7 +361,7 @@ diff --git a/testing/android/driver/java/AndroidManifest.xml b/testing/android/d
|
||||
android:versionName="1.0">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
||||
|
||||
<application android:label="OnDeviceInstrumentationDriver" />
|
||||
@@ -368,7 +373,7 @@ diff --git a/testing/android/native_test/java/AndroidManifest.xml.jinja2 b/testi
|
||||
android:versionName="1.0">
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
<uses-permission android:name="android.permission.BLUETOOTH"/>
|
||||
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
|
||||
@@ -380,7 +385,7 @@ diff --git a/tools/android/audio_focus_grabber/java/AndroidManifest.xml b/tools/
|
||||
package="org.chromium.tools.audio_focus_grabber" >
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
|
||||
<application
|
||||
android:label="@string/app_name" >
|
||||
@@ -392,10 +397,17 @@ diff --git a/tools/android/push_apps_to_background/AndroidManifest.xml b/tools/a
|
||||
android:versionName="1.0" >
|
||||
|
||||
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
|
||||
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="23" />
|
||||
|
||||
<application
|
||||
android:icon="@drawable/ic_launcher"
|
||||
@@ -26,4 +26,4 @@
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
-</manifest>
|
||||
\ No newline at end of file
|
||||
+</manifest>
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
|
||||
@@ -74,7 +74,7 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
|
||||
@@ -75,7 +75,7 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
|
||||
}
|
||||
});
|
||||
|
||||
@@ -65,7 +65,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
|
||||
int paddingStart = getResources().getDimensionPixelSize(
|
||||
R.dimen.fre_tos_checkbox_padding);
|
||||
ViewCompat.setPaddingRelative(mSendReportCheckBox,
|
||||
@@ -86,8 +86,10 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
|
||||
@@ -87,8 +87,10 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
|
||||
mSendReportCheckBox.setChecked(FirstRunActivity.DEFAULT_METRICS_AND_CRASH_REPORTING);
|
||||
} else {
|
||||
mSendReportCheckBox.setVisibility(View.GONE);
|
||||
@@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
|
||||
+ mSendReportCheckBox.setVisibility(View.GONE);
|
||||
mTosAndPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
|
||||
|
||||
NoUnderlineClickableSpan clickableTermsSpan = new NoUnderlineClickableSpan((view1) -> {
|
||||
Resources resources = getResources();
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -1,481 +0,0 @@
|
||||
From: dalyk <dalyk@google.com>
|
||||
Date: Wed, 13 Feb 2019 17:50:04 +0000
|
||||
Subject: Support different secure DNS modes within DnsTransaction.
|
||||
|
||||
In SECURE mode, only DnsHTTPAttempts should be made. In AUTOMATIC mode,
|
||||
DnsHTTPAttempts should be made first, before falling back to insecure
|
||||
attempts. In OFF mode, only insecure attempts should be made.
|
||||
|
||||
Follow-up work will correct cache lookups for SECURE and AUTOMATIC modes,
|
||||
remove the system resolver fallback for SECURE mode, set the mode
|
||||
based on the pref setting, and make AUTOMATIC mode more conservative by
|
||||
incorporating state related to DoH (DoH probes, successive DoH failures).
|
||||
|
||||
There should be no change in behavior experienced by users configuring
|
||||
DoH via the command line since AUTOMATIC mode is used for all queries
|
||||
currently.
|
||||
|
||||
Bug: 878582
|
||||
Change-Id: I5539c5273eb846c95f9a7cdab95429522bc43f50
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/1450858
|
||||
Reviewed-by: Paul Jensen <pauljensen@chromium.org>
|
||||
Commit-Queue: Katharine Daly <dalyk@google.com>
|
||||
Cr-Commit-Position: refs/heads/master@{#631784}
|
||||
---
|
||||
chrome/browser/net/dns_probe_runner.cc | 3 +-
|
||||
.../certificate_transparency/log_dns_client.cc | 3 +-
|
||||
net/dns/BUILD.gn | 1 +
|
||||
net/dns/dns_test_util.cc | 3 +-
|
||||
net/dns/dns_transaction.cc | 42 ++++++---
|
||||
net/dns/dns_transaction.h | 10 ++-
|
||||
net/dns/dns_transaction_unittest.cc | 99 ++++++++++++++++++++--
|
||||
net/dns/dns_util.h | 12 +++
|
||||
net/dns/host_resolver_impl.cc | 2 +-
|
||||
9 files changed, 154 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/net/dns_probe_runner.cc b/chrome/browser/net/dns_probe_runner.cc
|
||||
--- a/chrome/browser/net/dns_probe_runner.cc
|
||||
+++ b/chrome/browser/net/dns_probe_runner.cc
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "net/dns/dns_client.h"
|
||||
#include "net/dns/dns_response.h"
|
||||
#include "net/dns/dns_transaction.h"
|
||||
+#include "net/dns/dns_util.h"
|
||||
#include "net/dns/public/dns_protocol.h"
|
||||
#include "net/log/net_log_with_source.h"
|
||||
|
||||
@@ -109,7 +110,7 @@ void DnsProbeRunner::RunProbe(const base::Closure& callback) {
|
||||
kKnownGoodHostname, net::dns_protocol::kTypeA,
|
||||
base::Bind(&DnsProbeRunner::OnTransactionComplete,
|
||||
weak_factory_.GetWeakPtr()),
|
||||
- NetLogWithSource());
|
||||
+ NetLogWithSource(), net::SecureDnsMode::AUTOMATIC);
|
||||
|
||||
transaction_->Start();
|
||||
}
|
||||
diff --git a/components/certificate_transparency/log_dns_client.cc b/components/certificate_transparency/log_dns_client.cc
|
||||
--- a/components/certificate_transparency/log_dns_client.cc
|
||||
+++ b/components/certificate_transparency/log_dns_client.cc
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "net/dns/dns_config.h"
|
||||
#include "net/dns/dns_response.h"
|
||||
#include "net/dns/dns_transaction.h"
|
||||
+#include "net/dns/dns_util.h"
|
||||
#include "net/dns/public/dns_protocol.h"
|
||||
#include "net/dns/record_parsed.h"
|
||||
#include "net/dns/record_rdata.h"
|
||||
@@ -471,7 +472,7 @@ bool AuditProofQueryImpl::StartDnsTransaction(const std::string& qname) {
|
||||
qname, net::dns_protocol::kTypeTXT,
|
||||
base::BindOnce(&AuditProofQueryImpl::OnDnsTransactionComplete,
|
||||
weak_ptr_factory_.GetWeakPtr()),
|
||||
- net_log_);
|
||||
+ net_log_, net::SecureDnsMode::AUTOMATIC);
|
||||
|
||||
current_dns_transaction_->Start();
|
||||
return true;
|
||||
diff --git a/net/dns/BUILD.gn b/net/dns/BUILD.gn
|
||||
--- a/net/dns/BUILD.gn
|
||||
+++ b/net/dns/BUILD.gn
|
||||
@@ -291,6 +291,7 @@ source_set("dns_client") {
|
||||
"dns_client.h",
|
||||
"dns_response.h",
|
||||
"dns_transaction.h",
|
||||
+ "dns_util.h",
|
||||
"record_parsed.h",
|
||||
"record_rdata.h",
|
||||
]
|
||||
diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc
|
||||
--- a/net/dns/dns_test_util.cc
|
||||
+++ b/net/dns/dns_test_util.cc
|
||||
@@ -441,7 +441,8 @@ class MockDnsClient::MockTransactionFactory : public DnsTransactionFactory {
|
||||
const std::string& hostname,
|
||||
uint16_t qtype,
|
||||
DnsTransactionFactory::CallbackType callback,
|
||||
- const NetLogWithSource&) override {
|
||||
+ const NetLogWithSource&,
|
||||
+ SecureDnsMode) override {
|
||||
std::unique_ptr<MockTransaction> transaction =
|
||||
std::make_unique<MockTransaction>(rules_, hostname, qtype,
|
||||
std::move(callback));
|
||||
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
|
||||
--- a/net/dns/dns_transaction.cc
|
||||
+++ b/net/dns/dns_transaction.cc
|
||||
@@ -772,11 +772,13 @@ class DnsTransactionImpl : public DnsTransaction,
|
||||
uint16_t qtype,
|
||||
DnsTransactionFactory::CallbackType callback,
|
||||
const NetLogWithSource& net_log,
|
||||
- const OptRecordRdata* opt_rdata)
|
||||
+ const OptRecordRdata* opt_rdata,
|
||||
+ SecureDnsMode secure_dns_mode)
|
||||
: session_(session),
|
||||
hostname_(hostname),
|
||||
qtype_(qtype),
|
||||
opt_rdata_(opt_rdata),
|
||||
+ secure_dns_mode_(secure_dns_mode),
|
||||
callback_(std::move(callback)),
|
||||
net_log_(net_log),
|
||||
qnames_initial_size_(0),
|
||||
@@ -919,12 +921,17 @@ class DnsTransactionImpl : public DnsTransaction,
|
||||
}
|
||||
|
||||
AttemptResult MakeAttempt() {
|
||||
- // Make an HTTP attempt unless we have already made more attempts
|
||||
- // than we have configured servers. Otherwise make a UDP attempt
|
||||
- // as long as we have configured nameservers.
|
||||
DnsConfig config = session_->config();
|
||||
- if (doh_attempts_ < config.dns_over_https_servers.size())
|
||||
+ // In AUTOMATIC and SECURE mode, make an HTTP attempt unless we have already
|
||||
+ // made more attempts than we have configured servers.
|
||||
+ if (secure_dns_mode_ != SecureDnsMode::OFF &&
|
||||
+ doh_attempts_ < config.dns_over_https_servers.size()) {
|
||||
return MakeHTTPAttempt(config.dns_over_https_servers);
|
||||
+ }
|
||||
+ // In AUTOMATIC mode, insecure attempts are allowed after HTTP attempts are
|
||||
+ // exhausted. In OFF mode, only insecure attempts are allowed. It should
|
||||
+ // not be possible to reach this point in SECURE mode.
|
||||
+ DCHECK_NE(secure_dns_mode_, SecureDnsMode::SECURE);
|
||||
DCHECK_GT(config.nameservers.size(), 0u);
|
||||
return MakeUDPAttempt();
|
||||
}
|
||||
@@ -1112,8 +1119,19 @@ class DnsTransactionImpl : public DnsTransaction,
|
||||
if (had_tcp_attempt_)
|
||||
return false;
|
||||
const DnsConfig& config = session_->config();
|
||||
- return attempts_.size() < config.attempts * config.nameservers.size() +
|
||||
- config.dns_over_https_servers.size();
|
||||
+ unsigned insecure_attempts_possible =
|
||||
+ config.attempts * config.nameservers.size();
|
||||
+ unsigned secure_attempts_possible = config.dns_over_https_servers.size();
|
||||
+
|
||||
+ switch (secure_dns_mode_) {
|
||||
+ case SecureDnsMode::SECURE:
|
||||
+ return attempts_.size() < secure_attempts_possible;
|
||||
+ case SecureDnsMode::AUTOMATIC:
|
||||
+ return attempts_.size() <
|
||||
+ secure_attempts_possible + insecure_attempts_possible;
|
||||
+ case SecureDnsMode::OFF:
|
||||
+ return attempts_.size() < insecure_attempts_possible;
|
||||
+ }
|
||||
}
|
||||
|
||||
// Resolves the result of a DnsAttempt until a terminal result is reached
|
||||
@@ -1204,6 +1222,7 @@ class DnsTransactionImpl : public DnsTransaction,
|
||||
std::string hostname_;
|
||||
uint16_t qtype_;
|
||||
const OptRecordRdata* opt_rdata_;
|
||||
+ const SecureDnsMode secure_dns_mode_;
|
||||
// Cleared in DoCallback.
|
||||
DnsTransactionFactory::CallbackType callback_;
|
||||
|
||||
@@ -1248,10 +1267,11 @@ class DnsTransactionFactoryImpl : public DnsTransactionFactory {
|
||||
const std::string& hostname,
|
||||
uint16_t qtype,
|
||||
CallbackType callback,
|
||||
- const NetLogWithSource& net_log) override {
|
||||
- return std::make_unique<DnsTransactionImpl>(session_.get(), hostname, qtype,
|
||||
- std::move(callback), net_log,
|
||||
- opt_rdata_.get());
|
||||
+ const NetLogWithSource& net_log,
|
||||
+ SecureDnsMode secure_dns_mode) override {
|
||||
+ return std::make_unique<DnsTransactionImpl>(
|
||||
+ session_.get(), hostname, qtype, std::move(callback), net_log,
|
||||
+ opt_rdata_.get(), secure_dns_mode);
|
||||
}
|
||||
|
||||
void AddEDNSOption(const OptRecordRdata::Opt& opt) override {
|
||||
diff --git a/net/dns/dns_transaction.h b/net/dns/dns_transaction.h
|
||||
--- a/net/dns/dns_transaction.h
|
||||
+++ b/net/dns/dns_transaction.h
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
#include "base/callback.h"
|
||||
#include "net/base/request_priority.h"
|
||||
+#include "net/dns/dns_util.h"
|
||||
#include "net/dns/record_rdata.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
@@ -69,11 +70,18 @@ class NET_EXPORT_PRIVATE DnsTransactionFactory {
|
||||
//
|
||||
// The transaction will run |callback| upon asynchronous completion.
|
||||
// The |net_log| is used as the parent log.
|
||||
+ //
|
||||
+ // The |secure_dns_mode| specifies the order in which secure and/or insecure
|
||||
+ // DNS lookups will be performed. In SECURE mode, only secure lookups will be
|
||||
+ // perfomed. In AUTOMATIC mode, secure lookups will be performed first when
|
||||
+ // possible, and insecure lookups will be performed as a fallback. In OFF
|
||||
+ // mode, only insecure lookups will be performed.
|
||||
virtual std::unique_ptr<DnsTransaction> CreateTransaction(
|
||||
const std::string& hostname,
|
||||
uint16_t qtype,
|
||||
CallbackType callback,
|
||||
- const NetLogWithSource& net_log) WARN_UNUSED_RESULT = 0;
|
||||
+ const NetLogWithSource& net_log,
|
||||
+ SecureDnsMode secure_dns_mode) WARN_UNUSED_RESULT = 0;
|
||||
|
||||
// The given EDNS0 option will be included in all DNS queries performed by
|
||||
// transactions from this factory.
|
||||
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc
|
||||
--- a/net/dns/dns_transaction_unittest.cc
|
||||
+++ b/net/dns/dns_transaction_unittest.cc
|
||||
@@ -246,7 +246,17 @@ class TestSocketFactory : public MockClientSocketFactory {
|
||||
remote_endpoints_.push_back(endpoint);
|
||||
}
|
||||
|
||||
- std::vector<IPEndPoint> remote_endpoints_;
|
||||
+ struct RemoteNameserver {
|
||||
+ RemoteNameserver(IPEndPoint insecure_nameserver)
|
||||
+ : insecure_nameserver(insecure_nameserver) {}
|
||||
+ RemoteNameserver(DnsConfig::DnsOverHttpsServerConfig secure_nameserver)
|
||||
+ : secure_nameserver(secure_nameserver) {}
|
||||
+
|
||||
+ base::Optional<IPEndPoint> insecure_nameserver;
|
||||
+ base::Optional<DnsConfig::DnsOverHttpsServerConfig> secure_nameserver;
|
||||
+ };
|
||||
+
|
||||
+ std::vector<RemoteNameserver> remote_endpoints_;
|
||||
bool fail_next_socket_;
|
||||
|
||||
private:
|
||||
@@ -269,6 +279,7 @@ class TransactionHelper {
|
||||
int expected_answer_count)
|
||||
: hostname_(hostname),
|
||||
qtype_(qtype),
|
||||
+ secure_dns_mode_(SecureDnsMode::AUTOMATIC),
|
||||
response_(nullptr),
|
||||
expected_answer_count_(expected_answer_count),
|
||||
cancel_in_callback_(false),
|
||||
@@ -277,13 +288,19 @@ class TransactionHelper {
|
||||
// Mark that the transaction shall be destroyed immediately upon callback.
|
||||
void set_cancel_in_callback() { cancel_in_callback_ = true; }
|
||||
|
||||
+ // Set the secure DNS mode for the transaction.
|
||||
+ void set_secure_dns_mode(SecureDnsMode secure_dns_mode) {
|
||||
+ secure_dns_mode_ = secure_dns_mode;
|
||||
+ }
|
||||
+
|
||||
void StartTransaction(DnsTransactionFactory* factory) {
|
||||
EXPECT_EQ(NULL, transaction_.get());
|
||||
transaction_ = factory->CreateTransaction(
|
||||
hostname_, qtype_,
|
||||
base::Bind(&TransactionHelper::OnTransactionComplete,
|
||||
base::Unretained(this)),
|
||||
- NetLogWithSource::Make(&net_log_, net::NetLogSourceType::NONE));
|
||||
+ NetLogWithSource::Make(&net_log_, net::NetLogSourceType::NONE),
|
||||
+ secure_dns_mode_);
|
||||
transaction_->SetRequestContext(&request_context_);
|
||||
transaction_->SetRequestPriority(DEFAULT_PRIORITY);
|
||||
EXPECT_EQ(hostname_, transaction_->GetHostname());
|
||||
@@ -360,6 +377,7 @@ class TransactionHelper {
|
||||
private:
|
||||
std::string hostname_;
|
||||
uint16_t qtype_;
|
||||
+ SecureDnsMode secure_dns_mode_;
|
||||
std::unique_ptr<DnsTransaction> transaction_;
|
||||
const DnsResponse* response_;
|
||||
int expected_answer_count_;
|
||||
@@ -669,9 +687,20 @@ class DnsTransactionTestBase : public testing::Test {
|
||||
// |servers|.
|
||||
void CheckServerOrder(const unsigned* servers, size_t num_attempts) {
|
||||
ASSERT_EQ(num_attempts, socket_factory_->remote_endpoints_.size());
|
||||
+ auto num_insecure_nameservers = session_->config().nameservers.size();
|
||||
for (size_t i = 0; i < num_attempts; ++i) {
|
||||
- EXPECT_EQ(socket_factory_->remote_endpoints_[i],
|
||||
- session_->config().nameservers[servers[i]]);
|
||||
+ if (servers[i] < num_insecure_nameservers) {
|
||||
+ // Check insecure server match.
|
||||
+ EXPECT_EQ(
|
||||
+ socket_factory_->remote_endpoints_[i].insecure_nameserver.value(),
|
||||
+ session_->config().nameservers[servers[i]]);
|
||||
+ } else {
|
||||
+ // Check secure server match.
|
||||
+ EXPECT_EQ(
|
||||
+ socket_factory_->remote_endpoints_[i].secure_nameserver.value(),
|
||||
+ session_->config()
|
||||
+ .dns_over_https_servers[servers[i] - num_insecure_nameservers]);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -762,6 +791,7 @@ class DnsTransactionTest : public DnsTransactionTestBase,
|
||||
if (server.use_post && request->method() == "POST") {
|
||||
if (url_base == request->url().spec()) {
|
||||
server_found = true;
|
||||
+ socket_factory_->remote_endpoints_.push_back(server);
|
||||
}
|
||||
} else if (!server.use_post && request->method() == "GET") {
|
||||
std::string prefix = url_base + "?dns=";
|
||||
@@ -769,6 +799,7 @@ class DnsTransactionTest : public DnsTransactionTestBase,
|
||||
request->url().spec().begin());
|
||||
if (mispair.first == prefix.end()) {
|
||||
server_found = true;
|
||||
+ socket_factory_->remote_endpoints_.push_back(server);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1552,6 +1583,43 @@ TEST_F(DnsTransactionTest, HttpsPostFailThenUDPFallback) {
|
||||
TransactionHelper helper0(kT0HostName, kT0Qtype, kT0RecordCount);
|
||||
SetDohJobMakerCallback(base::BindRepeating(DohJobMakerCallbackFailStart));
|
||||
EXPECT_TRUE(helper0.RunUntilDone(transaction_factory_.get()));
|
||||
+ unsigned kOrder0[] = {1, 0};
|
||||
+ CheckServerOrder(kOrder0, base::size(kOrder0));
|
||||
+}
|
||||
+
|
||||
+TEST_F(DnsTransactionTest, HttpsPostFailNoUDPFallbackInSecureMode) {
|
||||
+ config_.attempts = 1;
|
||||
+ ConfigureNumServers(2);
|
||||
+ ConfigDohServers(false /* clear_udp */, true /* use_post */, 2);
|
||||
+ AddQueryAndErrorResponse(0, kT0HostName, kT0Qtype, ERR_CONNECTION_REFUSED,
|
||||
+ SYNCHRONOUS, Transport::HTTPS);
|
||||
+ AddQueryAndErrorResponse(0, kT0HostName, kT0Qtype, ERR_CONNECTION_REFUSED,
|
||||
+ SYNCHRONOUS, Transport::HTTPS);
|
||||
+ TransactionHelper helper0(kT0HostName, kT0Qtype, ERR_FAILED);
|
||||
+ helper0.set_secure_dns_mode(SecureDnsMode::SECURE);
|
||||
+ SetDohJobMakerCallback(base::BindRepeating(DohJobMakerCallbackFailStart));
|
||||
+ EXPECT_TRUE(helper0.RunUntilDone(transaction_factory_.get()));
|
||||
+ unsigned kOrder0[] = {2, 3};
|
||||
+ CheckServerOrder(kOrder0, base::size(kOrder0));
|
||||
+}
|
||||
+
|
||||
+TEST_F(DnsTransactionTest, NoHttpsAttemptInOffMode) {
|
||||
+ config_.attempts = 2;
|
||||
+ ConfigureNumServers(2);
|
||||
+ ConfigDohServers(false /* clear_udp */, true /* use_post */, 2);
|
||||
+ AddQueryAndErrorResponse(0, kT0HostName, kT0Qtype, ERR_CONNECTION_REFUSED,
|
||||
+ SYNCHRONOUS, Transport::UDP);
|
||||
+ AddQueryAndErrorResponse(0, kT0HostName, kT0Qtype, ERR_CONNECTION_REFUSED,
|
||||
+ SYNCHRONOUS, Transport::UDP);
|
||||
+ AddQueryAndErrorResponse(0, kT0HostName, kT0Qtype, ERR_CONNECTION_REFUSED,
|
||||
+ SYNCHRONOUS, Transport::UDP);
|
||||
+ AddQueryAndResponse(0, kT0HostName, kT0Qtype, kT0ResponseDatagram,
|
||||
+ base::size(kT0ResponseDatagram), ASYNC, Transport::UDP);
|
||||
+ TransactionHelper helper0(kT0HostName, kT0Qtype, kT0RecordCount);
|
||||
+ helper0.set_secure_dns_mode(SecureDnsMode::OFF);
|
||||
+ EXPECT_TRUE(helper0.RunUntilDone(transaction_factory_.get()));
|
||||
+ unsigned kOrder0[] = {0, 1, 0, 1};
|
||||
+ CheckServerOrder(kOrder0, base::size(kOrder0));
|
||||
}
|
||||
|
||||
TEST_F(DnsTransactionTest, HttpsPostFailThenUDPFailThenUDPFallback) {
|
||||
@@ -1575,6 +1643,8 @@ TEST_F(DnsTransactionTest, HttpsPostFailThenUDPFailThenUDPFallback) {
|
||||
EXPECT_EQ(session_->NextGoodServerIndex(0), 1u);
|
||||
EXPECT_EQ(session_->NextGoodServerIndex(1), 1u);
|
||||
EXPECT_EQ(session_->NextGoodServerIndex(2), 2u);
|
||||
+ unsigned kOrder0[] = {3, 0, 1};
|
||||
+ CheckServerOrder(kOrder0, base::size(kOrder0));
|
||||
}
|
||||
|
||||
TEST_F(DnsTransactionTest, HttpsMarkUdpBad) {
|
||||
@@ -1595,6 +1665,8 @@ TEST_F(DnsTransactionTest, HttpsMarkUdpBad) {
|
||||
EXPECT_EQ(session_->NextGoodServerIndex(0), 1u);
|
||||
EXPECT_EQ(session_->NextGoodServerIndex(1), 1u);
|
||||
EXPECT_EQ(session_->NextGoodDnsOverHttpsServerIndex(2), 2u);
|
||||
+ unsigned kOrder0[] = {2, 0, 1};
|
||||
+ CheckServerOrder(kOrder0, base::size(kOrder0));
|
||||
|
||||
AddQueryAndErrorResponse(1, kT1HostName, kT1Qtype, ERR_CONNECTION_REFUSED,
|
||||
SYNCHRONOUS, Transport::HTTPS);
|
||||
@@ -1612,6 +1684,11 @@ TEST_F(DnsTransactionTest, HttpsMarkUdpBad) {
|
||||
EXPECT_EQ(session_->NextGoodServerIndex(0), 0u);
|
||||
EXPECT_EQ(session_->NextGoodServerIndex(1), 0u);
|
||||
EXPECT_EQ(session_->NextGoodDnsOverHttpsServerIndex(2), 2u);
|
||||
+ unsigned kOrder1[] = {
|
||||
+ 2, 0, 1, /* transaction0 */
|
||||
+ 2, 1, 0 /* transaction1 */
|
||||
+ };
|
||||
+ CheckServerOrder(kOrder1, base::size(kOrder1));
|
||||
}
|
||||
|
||||
TEST_F(DnsTransactionTest, HttpsMarkHttpsBad) {
|
||||
@@ -1627,7 +1704,6 @@ TEST_F(DnsTransactionTest, HttpsMarkHttpsBad) {
|
||||
SYNCHRONOUS, Transport::HTTPS);
|
||||
AddQueryAndErrorResponse(1, kT1HostName, kT1Qtype, ERR_CONNECTION_REFUSED,
|
||||
SYNCHRONOUS, Transport::HTTPS);
|
||||
-
|
||||
AddQueryAndResponse(1, kT1HostName, kT1Qtype, kT1ResponseDatagram,
|
||||
base::size(kT1ResponseDatagram), ASYNC, Transport::HTTPS);
|
||||
TransactionHelper helper0(kT0HostName, kT0Qtype, kT0RecordCount);
|
||||
@@ -1640,6 +1716,8 @@ TEST_F(DnsTransactionTest, HttpsMarkHttpsBad) {
|
||||
EXPECT_EQ(session_->NextGoodDnsOverHttpsServerIndex(1), 3u);
|
||||
EXPECT_EQ(session_->NextGoodDnsOverHttpsServerIndex(2), 3u);
|
||||
EXPECT_EQ(session_->NextGoodDnsOverHttpsServerIndex(3), 3u);
|
||||
+ unsigned kOrder0[] = {1, 2, 3};
|
||||
+ CheckServerOrder(kOrder0, base::size(kOrder0));
|
||||
|
||||
EXPECT_TRUE(helper1.RunUntilDone(transaction_factory_.get()));
|
||||
// Server 0 is still our only UDP server, so will be good by definition.
|
||||
@@ -1651,6 +1729,11 @@ TEST_F(DnsTransactionTest, HttpsMarkHttpsBad) {
|
||||
EXPECT_EQ(session_->NextGoodDnsOverHttpsServerIndex(1), 2u);
|
||||
EXPECT_EQ(session_->NextGoodDnsOverHttpsServerIndex(2), 2u);
|
||||
EXPECT_EQ(session_->NextGoodDnsOverHttpsServerIndex(3), 2u);
|
||||
+ unsigned kOrder1[] = {
|
||||
+ 1, 2, 3, /* transaction0 */
|
||||
+ 3, 1, 2 /* transaction1 */
|
||||
+ };
|
||||
+ CheckServerOrder(kOrder1, base::size(kOrder1));
|
||||
}
|
||||
|
||||
TEST_F(DnsTransactionTest, HttpsPostFailThenHTTPFallback) {
|
||||
@@ -1662,6 +1745,8 @@ TEST_F(DnsTransactionTest, HttpsPostFailThenHTTPFallback) {
|
||||
Transport::HTTPS);
|
||||
TransactionHelper helper0(kT0HostName, kT0Qtype, kT0RecordCount);
|
||||
EXPECT_TRUE(helper0.RunUntilDone(transaction_factory_.get()));
|
||||
+ unsigned kOrder0[] = {0, 1};
|
||||
+ CheckServerOrder(kOrder0, base::size(kOrder0));
|
||||
}
|
||||
|
||||
TEST_F(DnsTransactionTest, HttpsPostFailTwiceThenUDPFallback) {
|
||||
@@ -1678,6 +1763,8 @@ TEST_F(DnsTransactionTest, HttpsPostFailTwiceThenUDPFallback) {
|
||||
TransactionHelper helper0(kT0HostName, kT0Qtype, kT0RecordCount);
|
||||
SetDohJobMakerCallback(base::BindRepeating(DohJobMakerCallbackFailStart));
|
||||
EXPECT_TRUE(helper0.RunUntilDone(transaction_factory_.get()));
|
||||
+ unsigned kOrder0[] = {1, 2, 0};
|
||||
+ CheckServerOrder(kOrder0, base::size(kOrder0));
|
||||
}
|
||||
|
||||
TEST_F(DnsTransactionTest, HttpsPostFailTwice) {
|
||||
@@ -1692,6 +1779,8 @@ TEST_F(DnsTransactionTest, HttpsPostFailTwice) {
|
||||
TransactionHelper helper0(kT0HostName, kT0Qtype, ERR_FAILED);
|
||||
SetDohJobMakerCallback(base::BindRepeating(DohJobMakerCallbackFailStart));
|
||||
EXPECT_TRUE(helper0.RunUntilDone(transaction_factory_.get()));
|
||||
+ unsigned kOrder0[] = {0, 1};
|
||||
+ CheckServerOrder(kOrder0, base::size(kOrder0));
|
||||
}
|
||||
|
||||
void MakeResponseWithCookie(URLRequest* request, HttpResponseInfo* info) {
|
||||
diff --git a/net/dns/dns_util.h b/net/dns/dns_util.h
|
||||
--- a/net/dns/dns_util.h
|
||||
+++ b/net/dns/dns_util.h
|
||||
@@ -93,6 +93,18 @@ uint16_t DnsQueryTypeToQtype(DnsQueryType dns_query_type);
|
||||
NET_EXPORT DnsQueryType
|
||||
AddressFamilyToDnsQueryType(AddressFamily address_family);
|
||||
|
||||
+// The SecureDnsMode specifies what types of lookups (secure/insecure) should
|
||||
+// be performed and in what order when resolving a specific query.
|
||||
+enum SecureDnsMode : int {
|
||||
+ // In OFF mode, no DoH lookups should be performed.
|
||||
+ OFF,
|
||||
+ // In AUTOMATIC mode, DoH lookups should be performed first if DoH is
|
||||
+ // available, and insecure DNS lookups should be performed as a fallback.
|
||||
+ AUTOMATIC,
|
||||
+ // In SECURE mode, only DoH lookups should be performed.
|
||||
+ SECURE,
|
||||
+};
|
||||
+
|
||||
} // namespace net
|
||||
|
||||
#endif // NET_DNS_DNS_UTIL_H_
|
||||
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
|
||||
--- a/net/dns/host_resolver_impl.cc
|
||||
+++ b/net/dns/host_resolver_impl.cc
|
||||
@@ -1066,7 +1066,7 @@ class HostResolverImpl::DnsTask : public base::SupportsWeakPtr<DnsTask> {
|
||||
base::BindOnce(&DnsTask::OnTransactionComplete,
|
||||
base::Unretained(this), tick_clock_->NowTicks(),
|
||||
dns_query_type),
|
||||
- net_log_);
|
||||
+ net_log_, SecureDnsMode::AUTOMATIC);
|
||||
trans->SetRequestContext(delegate_->url_request_context());
|
||||
trans->SetRequestPriority(delegate_->priority());
|
||||
return trans;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -16,7 +16,7 @@ higher memory/cache usage but not by the full 2-3%.
|
||||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -259,16 +259,12 @@ config("compiler") {
|
||||
@@ -253,16 +253,12 @@ config("compiler") {
|
||||
cflags += [ "-fstack-protector" ]
|
||||
}
|
||||
} else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
|
||||
|
||||
@@ -6,8 +6,8 @@ Subject: Use 4 tile rows, never show logo
|
||||
.../java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java | 6 +++---
|
||||
.../chromium/chrome/browser/suggestions/MostVisitedSitesBridge.java | 2 +-
|
||||
.../src/org/chromium/chrome/browser/suggestions/SiteSection.java | 2 +-
|
||||
chrome/browser/engagement/important_sites_util.cc | 2 +-
|
||||
components/history/core/browser/top_sites_impl.h | 2 +-
|
||||
components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc | 2 +-
|
||||
5 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
|
||||
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
private boolean mSearchProviderIsGoogle;
|
||||
|
||||
private boolean mInitialized;
|
||||
@@ -550,7 +550,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
|
||||
@@ -542,7 +542,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
|
||||
&& mInitialized) {
|
||||
return;
|
||||
}
|
||||
@@ -31,7 +31,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageL
|
||||
mSearchProviderIsGoogle = isGoogle;
|
||||
|
||||
updateTileGridPadding();
|
||||
@@ -839,7 +839,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
|
||||
@@ -834,7 +834,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
|
||||
}
|
||||
|
||||
private static int getMaxTileRows() {
|
||||
@@ -64,6 +64,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sit
|
||||
}
|
||||
|
||||
@LayoutRes
|
||||
diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/engagement/important_sites_util.cc
|
||||
--- a/chrome/browser/engagement/important_sites_util.cc
|
||||
+++ b/chrome/browser/engagement/important_sites_util.cc
|
||||
@@ -58,7 +58,7 @@ static const int kTimesIgnoredForBlacklist = 3;
|
||||
// These are the maximum # of bookmarks we can use as signals. If the user has
|
||||
// <= kMaxBookmarks, then we just use those bookmarks. Otherwise we filter all
|
||||
// bookmarks on site engagement > 0, sort, and trim to kMaxBookmarks.
|
||||
-static const int kMaxBookmarks = 5;
|
||||
+static const int kMaxBookmarks = 4 * 4 + 2;
|
||||
|
||||
// We need this to be a macro, as the histogram macros cache their pointers
|
||||
// after the first call, so when we change the uma name we check fail if we're
|
||||
diff --git a/components/history/core/browser/top_sites_impl.h b/components/history/core/browser/top_sites_impl.h
|
||||
--- a/components/history/core/browser/top_sites_impl.h
|
||||
+++ b/components/history/core/browser/top_sites_impl.h
|
||||
@@ -76,18 +88,6 @@ diff --git a/components/history/core/browser/top_sites_impl.h b/components/histo
|
||||
|
||||
TopSitesImpl(PrefService* pref_service,
|
||||
HistoryService* history_service,
|
||||
diff --git a/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc b/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc
|
||||
--- a/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc
|
||||
+++ b/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc
|
||||
@@ -30,7 +30,7 @@ namespace ntp_snippets {
|
||||
|
||||
namespace {
|
||||
|
||||
-const int kMaxBookmarks = 10;
|
||||
+const int kMaxBookmarks = 4 * 4 + 2;
|
||||
const int kMaxBookmarkAgeInDays = 7;
|
||||
|
||||
const char* kMaxBookmarksParamName = "bookmarks_max_count";
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ sandboxing.
|
||||
diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/java/AndroidManifest.xml
|
||||
--- a/android_webview/apk/java/AndroidManifest.xml
|
||||
+++ b/android_webview/apk/java/AndroidManifest.xml
|
||||
@@ -25,7 +25,6 @@
|
||||
@@ -28,7 +28,6 @@
|
||||
android:icon="@{{manifest_package|default('com.android.webview')}}:drawable/icon_webview"
|
||||
android:name="{{ application_name|default('com.android.webview.chromium.WebViewApplication') }}"
|
||||
android:multiArch="true"
|
||||
|
||||
@@ -27,9 +27,9 @@ diff --git a/chrome/browser/ui/android/android_about_app_info.cc b/chrome/browse
|
||||
diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc
|
||||
--- a/components/version_info/version_info.cc
|
||||
+++ b/components/version_info/version_info.cc
|
||||
@@ -7,13 +7,24 @@
|
||||
#include "base/logging.h"
|
||||
@@ -8,13 +8,24 @@
|
||||
#include "base/no_destructor.h"
|
||||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/version.h"
|
||||
+#include "base/system/sys_info.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
@@ -11,15 +11,15 @@ Disables the autofill download manager (trk:158).
|
||||
diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc
|
||||
--- a/components/autofill/core/browser/autofill_download_manager.cc
|
||||
+++ b/components/autofill/core/browser/autofill_download_manager.cc
|
||||
@@ -52,7 +52,6 @@ namespace autofill {
|
||||
|
||||
namespace {
|
||||
@@ -60,7 +60,6 @@ constexpr std::pair<int, int> kAutofillExperimentRanges[] = {
|
||||
{3314445, 3314448}, {3314854, 3314883},
|
||||
};
|
||||
|
||||
-const size_t kMaxQueryGetSize = 1400; // 1.25KB
|
||||
const size_t kAutofillDownloadManagerMaxFormCacheSize = 16;
|
||||
const size_t kMaxFieldsPerQueryRequest = 100;
|
||||
|
||||
@@ -412,6 +411,7 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload,
|
||||
@@ -448,6 +447,7 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload,
|
||||
return upload_request.SerializeToString(payload);
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
|
||||
// Gets an API method URL given its type (query or upload) and an optional
|
||||
// resource ID.
|
||||
// Example usage:
|
||||
@@ -434,6 +434,7 @@ std::string GetAPIMethodUrl(AutofillDownloadManager::RequestType type,
|
||||
@@ -470,6 +470,7 @@ std::string GetAPIMethodUrl(AutofillDownloadManager::RequestType type,
|
||||
}
|
||||
return base::StrCat({api_method_url, "/", resource_id});
|
||||
}
|
||||
@@ -35,7 +35,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -559,6 +560,7 @@ void AutofillDownloadManager::ClearUploadHistory(PrefService* pref_service) {
|
||||
@@ -643,6 +644,7 @@ void AutofillDownloadManager::ClearUploadHistory(PrefService* pref_service) {
|
||||
|
||||
std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
|
||||
const FormRequestData& request_data) const {
|
||||
@@ -43,7 +43,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
|
||||
std::string method("POST");
|
||||
std::string query_str;
|
||||
|
||||
@@ -581,12 +583,17 @@ std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
|
||||
@@ -665,12 +667,17 @@ std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
|
||||
GURL url = autofill_server_url_
|
||||
.Resolve(RequestTypeToString(request_data.request_type))
|
||||
.ReplaceComponents(replacements);
|
||||
@@ -61,7 +61,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
|
||||
// ID of the resource to add to the API request URL. Nothing will be added if
|
||||
// |resource_id| is empty.
|
||||
std::string resource_id;
|
||||
@@ -615,6 +622,10 @@ AutofillDownloadManager::GetRequestURLAndMethodForApi(
|
||||
@@ -699,6 +706,10 @@ AutofillDownloadManager::GetRequestURLAndMethodForApi(
|
||||
(request_data.request_type == AutofillDownloadManager::REQUEST_QUERY)
|
||||
? "GET"
|
||||
: "POST";
|
||||
@@ -75,7 +75,7 @@ diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/com
|
||||
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
|
||||
--- a/components/autofill/core/browser/autofill_manager.cc
|
||||
+++ b/components/autofill/core/browser/autofill_manager.cc
|
||||
@@ -172,19 +172,6 @@ void LogDeveloperEngagementUkm(ukm::UkmRecorder* ukm_recorder,
|
||||
@@ -176,19 +176,6 @@ void LogDeveloperEngagementUkm(ukm::UkmRecorder* ukm_recorder,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
|
||||
} // namespace
|
||||
|
||||
AutofillManager::FillingContext::FillingContext() = default;
|
||||
@@ -1281,11 +1268,6 @@ AutofillManager::AutofillManager(
|
||||
@@ -1277,11 +1264,6 @@ AutofillManager::AutofillManager(
|
||||
weak_ptr_factory_(this) {
|
||||
DCHECK(driver);
|
||||
DCHECK(client_);
|
||||
|
||||
@@ -4,22 +4,28 @@ Subject: dns: send IPv6 connectivity probes to RIPE DNS
|
||||
|
||||
Short of disabling the code (we may do that in a subsequent patch
|
||||
anyway), avoid sending to Google.
|
||||
---
|
||||
net/dns/host_resolver_impl.cc | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
|
||||
--- a/net/dns/host_resolver_impl.cc
|
||||
+++ b/net/dns/host_resolver_impl.cc
|
||||
@@ -122,10 +122,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
|
||||
Increase probe period from 1s to 15s
|
||||
---
|
||||
net/dns/host_resolver_manager.cc | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
|
||||
--- a/net/dns/host_resolver_manager.cc
|
||||
+++ b/net/dns/host_resolver_manager.cc
|
||||
@@ -118,12 +118,12 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
|
||||
|
||||
// Time between IPv6 probes, i.e. for how long results of each IPv6 probe are
|
||||
// cached.
|
||||
const int kIPv6ProbePeriodMs = 1000;
|
||||
-const int kIPv6ProbePeriodMs = 1000;
|
||||
+const int kIPv6ProbePeriodMs = 15000;
|
||||
|
||||
-// 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 };
|
||||
-const uint8_t kIPv6ProbeAddress[] = {0x20, 0x01, 0x48, 0x60, 0x48, 0x60,
|
||||
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
- 0x00, 0x00, 0x88, 0x88};
|
||||
+// RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted)
|
||||
+const uint8_t kIPv6ProbeAddress[] =
|
||||
+ { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00,
|
||||
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/28
|
||||
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
|
||||
--- a/extensions/common/extension.cc
|
||||
+++ b/extensions/common/extension.cc
|
||||
@@ -379,9 +379,12 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
|
||||
@@ -394,9 +394,12 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
|
||||
}
|
||||
|
||||
bool Extension::ShouldExposeViaManagementAPI() const {
|
||||
|
||||
+21
-21
@@ -30,21 +30,21 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
|
||||
#include "base/macros.h"
|
||||
#include "base/optional.h"
|
||||
+#include "base/rand_util.h"
|
||||
#include "cc/input/overscroll_behavior.h"
|
||||
#include "cc/input/scroll_snap_data.h"
|
||||
#include "services/metrics/public/cpp/mojo_ukm_recorder.h"
|
||||
#include "services/metrics/public/cpp/ukm_builders.h"
|
||||
#include "services/metrics/public/cpp/ukm_source_id.h"
|
||||
@@ -734,6 +735,10 @@ Document::Document(const DocumentInit& initializer,
|
||||
}
|
||||
DCHECK(fetcher_);
|
||||
|
||||
@@ -738,6 +739,10 @@ Document::Document(const DocumentInit& initializer,
|
||||
// also depend on the url NOT getting immediately set in opened windows.
|
||||
// See fast/dom/early-frame-url.html
|
||||
// and fast/dom/location-new-window-no-crash.html, respectively.
|
||||
+ // add X/Y noise factors that will be used to mitigate fingerprinting
|
||||
+ shuffleFactorX_ = base::RandDouble();
|
||||
+ shuffleFactorY_ = base::RandDouble();
|
||||
+
|
||||
root_scroller_controller_ = RootScrollerController::Create(*this);
|
||||
|
||||
// We depend on the url getting immediately set in subframes, but we
|
||||
@@ -799,6 +804,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
|
||||
// FIXME: Can/should we unify this behavior?
|
||||
if (initializer.ShouldSetURL()) {
|
||||
SetURL(initializer.Url());
|
||||
@@ -797,6 +802,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
|
||||
Position::BeforeNode(*shadow_host));
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
|
||||
diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
|
||||
--- a/third_party/blink/renderer/core/dom/document.h
|
||||
+++ b/third_party/blink/renderer/core/dom/document.h
|
||||
@@ -389,6 +389,9 @@ class CORE_EXPORT Document : public ContainerNode,
|
||||
@@ -392,6 +392,9 @@ class CORE_EXPORT Document : public ContainerNode,
|
||||
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
|
||||
}
|
||||
|
||||
@@ -72,19 +72,19 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
|
||||
String visibilityState() const;
|
||||
bool IsPageVisible() const;
|
||||
bool hidden() const;
|
||||
@@ -1798,6 +1801,8 @@ class CORE_EXPORT Document : public ContainerNode,
|
||||
|
||||
double start_time_;
|
||||
|
||||
@@ -1814,6 +1817,8 @@ class CORE_EXPORT Document : public ContainerNode,
|
||||
Vector<AXContext*> ax_contexts_;
|
||||
Member<AXObjectCache> ax_object_cache_;
|
||||
Member<DocumentMarkerController> markers_;
|
||||
+ double shuffleFactorX_, shuffleFactorY_;
|
||||
+
|
||||
TraceWrapperMember<ScriptRunner> script_runner_;
|
||||
|
||||
HeapVector<Member<ScriptElementBase>> current_script_stack_;
|
||||
bool update_focus_appearance_after_layout_ = false;
|
||||
|
||||
diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
|
||||
--- a/third_party/blink/renderer/core/dom/element.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/element.cc
|
||||
@@ -1202,6 +1202,15 @@ DOMRectList* Element::getClientRects() {
|
||||
@@ -1321,6 +1321,15 @@ DOMRectList* Element::getClientRects() {
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
|
||||
quads, *element_layout_object);
|
||||
@@ -100,7 +100,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
|
||||
return DOMRectList::Create(quads);
|
||||
}
|
||||
|
||||
@@ -1219,6 +1228,13 @@ DOMRect* Element::getBoundingClientRect() {
|
||||
@@ -1338,6 +1347,13 @@ DOMRect* Element::getBoundingClientRect() {
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
|
||||
*element_layout_object);
|
||||
@@ -117,7 +117,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
|
||||
diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc
|
||||
--- a/third_party/blink/renderer/core/dom/range.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/range.cc
|
||||
@@ -1646,11 +1646,27 @@ DOMRectList* Range::getClientRects() const {
|
||||
@@ -1643,11 +1643,27 @@ DOMRectList* Range::getClientRects() const {
|
||||
Vector<FloatQuad> quads;
|
||||
GetBorderAndTextQuads(quads);
|
||||
|
||||
@@ -198,7 +198,7 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
|
||||
#include "third_party/blink/public/common/features.h"
|
||||
#include "third_party/blink/public/platform/platform.h"
|
||||
#include "third_party/blink/public/platform/task_type.h"
|
||||
@@ -784,8 +786,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
|
||||
@@ -793,8 +795,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
|
||||
else
|
||||
direction = ToTextDirection(GetState().GetDirection(), canvas());
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHe
|
||||
import org.chromium.base.ContextUtils;
|
||||
import org.chromium.base.Log;
|
||||
import org.chromium.base.VisibleForTesting;
|
||||
@@ -73,23 +69,7 @@ public class SigninHelper {
|
||||
@@ -74,23 +70,7 @@ public class SigninHelper {
|
||||
@Override
|
||||
public List<String> getAccountChangeEvents(
|
||||
Context context, int index, String accountName) {
|
||||
@@ -86,7 +86,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon
|
||||
import com.google.android.gms.common.ConnectionResult;
|
||||
import com.google.android.gms.common.GoogleApiAvailability;
|
||||
|
||||
@@ -117,48 +114,18 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
|
||||
@@ -116,48 +113,18 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
|
||||
// so don't report any accounts if Google Play Services are out of date.
|
||||
checkCanUseGooglePlayServices();
|
||||
|
||||
@@ -138,7 +138,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -198,17 +165,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
|
||||
@@ -187,17 +154,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
|
||||
@SuppressLint("MissingPermission")
|
||||
@Override
|
||||
public void createAddAccountIntent(Callback<Intent> callback) {
|
||||
|
||||
@@ -3,16 +3,15 @@ Date: Fri, 22 Jun 2018 17:11:38 +0200
|
||||
Subject: kill GCM
|
||||
|
||||
---
|
||||
build/secondary/third_party/android_tools/BUILD.gn | 3 -
|
||||
chrome/android/BUILD.gn | 1 -
|
||||
chrome/android/chrome_java_sources.gni | 5 -
|
||||
chrome/android/java/AndroidManifest.xml | 62 ---------
|
||||
.../chrome/browser/BackgroundSyncLauncher.java | 97 --------------
|
||||
.../chrome/browser/ChromeBackgroundService.java | 1 -
|
||||
.../invalidation/InvalidationController.java | 13 --
|
||||
.../invalidation/InvalidationController.java | 8 --
|
||||
.../browser/ntp/snippets/SnippetsLauncher.java | 44 -------
|
||||
.../browser/services/gcm/GCMBackgroundTask.java | 2 +-
|
||||
.../gcm/InvalidationGcmUpstreamSender.java | 15 ---
|
||||
chrome/android/java_sources.gni | 2 -
|
||||
components/background_task_scheduler/BUILD.gn | 1 -
|
||||
.../BackgroundTaskSchedulerGcmNetworkManager.java | 146 +--------------------
|
||||
components/gcm_driver/android/BUILD.gn | 1 -
|
||||
@@ -22,36 +21,45 @@ Subject: kill GCM
|
||||
third_party/cacheinvalidation/BUILD.gn | 6 -
|
||||
.../client/contrib/MultiplexingGcmListener.java | 92 +------------
|
||||
.../android2/channel/AndroidNetworkChannel.java | 18 +--
|
||||
19 files changed, 15 insertions(+), 531 deletions(-)
|
||||
18 files changed, 15 insertions(+), 526 deletions(-)
|
||||
|
||||
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
|
||||
--- a/build/secondary/third_party/android_tools/BUILD.gn
|
||||
+++ b/build/secondary/third_party/android_tools/BUILD.gn
|
||||
@@ -83,9 +83,6 @@ if (enable_java_templates) {
|
||||
testonly = true
|
||||
java_files = [ "//third_party/android_tools/sdk/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]
|
||||
}
|
||||
- android_java_prebuilt("android_gcm_java") {
|
||||
- jar_path = "//third_party/android_tools/sdk/extras/google/gcm/gcm-client/dist/gcm.jar"
|
||||
- }
|
||||
android_java_prebuilt("emma_device_java") {
|
||||
jar_path = "//third_party/android_tools/sdk/tools/lib/emma_device.jar"
|
||||
include_java_resources = true
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
+++ b/chrome/android/BUILD.gn
|
||||
@@ -369,7 +369,6 @@ android_library("chrome_java") {
|
||||
@@ -343,7 +343,6 @@ android_library("chrome_java") {
|
||||
"//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
|
||||
"//third_party/android_deps:javax_inject_javax_inject_java",
|
||||
"//third_party/android_media:android_media_java",
|
||||
- "//third_party/android_sdk:android_gcm_java",
|
||||
"//third_party/android_swipe_refresh:android_swipe_refresh_java",
|
||||
- "//third_party/android_tools:android_gcm_java",
|
||||
"//third_party/blink/public:android_mojo_bindings_java",
|
||||
"//third_party/blink/public:blink_headers_java",
|
||||
"//third_party/blink/public/mojom:android_mojo_bindings_java",
|
||||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -22,7 +22,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/ChromeActivity.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeApplication.java",
|
||||
- "java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
|
||||
@@ -1427,10 +1426,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java",
|
||||
"java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java",
|
||||
"java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java",
|
||||
- "java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java",
|
||||
- "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java",
|
||||
- "java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java",
|
||||
- "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
|
||||
"java/src/org/chromium/chrome/browser/sessions/SessionTabHelper.java",
|
||||
"java/src/org/chromium/chrome/browser/share/OptionalShareTargetsManager.java",
|
||||
"java/src/org/chromium/chrome/browser/share/ShareActivity.java",
|
||||
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
|
||||
--- a/chrome/android/java/AndroidManifest.xml
|
||||
+++ b/chrome/android/java/AndroidManifest.xml
|
||||
@@ -77,22 +77,17 @@ by a child template that "extends" this file.
|
||||
@@ -72,22 +72,17 @@ by a child template that "extends" this file.
|
||||
<permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
|
||||
<permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
|
||||
<permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
|
||||
@@ -73,8 +81,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
||||
- <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
|
||||
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
|
||||
|
||||
<uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
|
||||
@@ -991,43 +986,6 @@ by a child template that "extends" this file.
|
||||
{% block extra_uses_permissions %}
|
||||
@@ -1034,47 +1029,8 @@ by a child template that "extends" this file.
|
||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
|
||||
android:hardwareAccelerated="false" />
|
||||
|
||||
@@ -115,11 +123,6 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
||||
- <service android:name="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"
|
||||
- android:exported="false"/>
|
||||
-
|
||||
<!-- Notification service for sync. -->
|
||||
<meta-data android:name="ipc.invalidation.ticl.listener_service_class"
|
||||
android:value="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"/>
|
||||
@@ -1039,8 +997,6 @@ by a child template that "extends" this file.
|
||||
</service>
|
||||
<service android:name="com.google.ipc.invalidation.ticl.android2.TiclService"
|
||||
android:exported="false"/>
|
||||
- <service android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"
|
||||
@@ -127,7 +130,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
||||
<receiver android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"
|
||||
android:exported="false"/>
|
||||
<receiver android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"
|
||||
@@ -1067,24 +1023,6 @@ by a child template that "extends" this file.
|
||||
@@ -1101,24 +1057,6 @@ by a child template that "extends" this file.
|
||||
android:exported="false"
|
||||
android:permission="android.permission.BIND_JOB_SERVICE"/>
|
||||
|
||||
@@ -175,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL
|
||||
/**
|
||||
* Disables the automatic use of the GCMNetworkManager. When disabled, the methods which
|
||||
* interact with GCM can still be used, but will not be called automatically on creation, or by
|
||||
@@ -124,30 +118,6 @@ public class BackgroundSyncLauncher {
|
||||
@@ -123,30 +117,6 @@ public class BackgroundSyncLauncher {
|
||||
@VisibleForTesting
|
||||
@CalledByNative
|
||||
protected void launchBrowserIfStopped(final boolean shouldLaunch, final long minDelayMs) {
|
||||
@@ -206,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -159,7 +129,6 @@ public class BackgroundSyncLauncher {
|
||||
@@ -158,7 +128,6 @@ public class BackgroundSyncLauncher {
|
||||
}
|
||||
|
||||
protected BackgroundSyncLauncher() {
|
||||
@@ -214,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL
|
||||
launchBrowserIfStopped(false, 0);
|
||||
}
|
||||
|
||||
@@ -188,72 +157,6 @@ public class BackgroundSyncLauncher {
|
||||
@@ -187,72 +156,6 @@ public class BackgroundSyncLauncher {
|
||||
return !sGCMEnabled;
|
||||
}
|
||||
|
||||
@@ -290,7 +293,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncL
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
|
||||
@@ -115,7 +115,6 @@ public class ChromeBackgroundService extends GcmTaskService {
|
||||
@@ -113,7 +113,6 @@ public class ChromeBackgroundService extends GcmTaskService {
|
||||
|
||||
@VisibleForTesting
|
||||
protected void rescheduleBackgroundSyncTasksOnUpgrade() {
|
||||
@@ -310,22 +313,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/In
|
||||
import org.chromium.base.ApplicationState;
|
||||
import org.chromium.base.ApplicationStatus;
|
||||
import org.chromium.base.ContextUtils;
|
||||
@@ -192,18 +190,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
|
||||
@@ -193,13 +191,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
|
||||
* Registers for Google Cloud Messaging (GCM) for Invalidations.
|
||||
*/
|
||||
private void ensureGcmIsInitialized() {
|
||||
- if (mGcmInitialized) return;
|
||||
mGcmInitialized = true;
|
||||
- new AsyncTask<Void>() {
|
||||
- @Override
|
||||
- protected Void doInBackground() {
|
||||
- boolean useGcmUpstream = true;
|
||||
- AndroidGcmController.get(ContextUtils.getApplicationContext())
|
||||
- .initializeGcm(useGcmUpstream);
|
||||
- return null;
|
||||
- }
|
||||
- }
|
||||
- .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||
- PostTask.postTask(TaskTraits.BEST_EFFORT_MAY_BLOCK, () -> {
|
||||
- boolean useGcmUpstream = true;
|
||||
- AndroidGcmController.get(ContextUtils.getApplicationContext())
|
||||
- .initializeGcm(useGcmUpstream);
|
||||
- });
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
@@ -445,8 +443,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/In
|
||||
import com.google.ipc.invalidation.ticl.android2.channel.GcmUpstreamSenderService;
|
||||
|
||||
import org.chromium.base.ContextUtils;
|
||||
@@ -93,20 +92,6 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
|
||||
* This function runs on a thread from the AsyncTask.THREAD_POOL_EXECUTOR.
|
||||
@@ -87,20 +86,6 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
|
||||
* This function runs on a thread pool executor thread.
|
||||
*/
|
||||
private void sendUpstreamMessage(String to, Bundle data, String token, Context context) {
|
||||
- // Add the OAuth2 token to the bundle. The token should have the prefix Bearer added to it.
|
||||
@@ -466,25 +464,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/In
|
||||
}
|
||||
|
||||
private boolean isMessageWithinLimit(Bundle data) {
|
||||
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
|
||||
--- a/chrome/android/java_sources.gni
|
||||
+++ b/chrome/android/java_sources.gni
|
||||
@@ -31,7 +31,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/ChromeActivity.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeApplication.java",
|
||||
- "java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeFeatureList.java",
|
||||
@@ -1447,7 +1446,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java",
|
||||
"java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java",
|
||||
"java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java",
|
||||
- "java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java",
|
||||
"java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java",
|
||||
"java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java",
|
||||
"java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
|
||||
diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
|
||||
--- a/components/background_task_scheduler/BUILD.gn
|
||||
+++ b/components/background_task_scheduler/BUILD.gn
|
||||
@@ -604,11 +583,11 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
|
||||
- @TaskInfo.NetworkType int networkType) {
|
||||
- switch (networkType) {
|
||||
- // This is correct: GcmNM ANY means no network is guaranteed.
|
||||
- case TaskInfo.NETWORK_TYPE_NONE:
|
||||
- case TaskInfo.NetworkType.NONE:
|
||||
- return Task.NETWORK_STATE_ANY;
|
||||
- case TaskInfo.NETWORK_TYPE_ANY:
|
||||
- case TaskInfo.NetworkType.ANY:
|
||||
- return Task.NETWORK_STATE_CONNECTED;
|
||||
- case TaskInfo.NETWORK_TYPE_UNMETERED:
|
||||
- case TaskInfo.NetworkType.UNMETERED:
|
||||
- return Task.NETWORK_STATE_UNMETERED;
|
||||
- default:
|
||||
- assert false;
|
||||
@@ -678,7 +657,7 @@ diff --git a/components/gcm_driver/android/BUILD.gn b/components/gcm_driver/andr
|
||||
deps = [
|
||||
"//base:base_java",
|
||||
"//content/public/android:content_java",
|
||||
- "//third_party/android_tools:android_gcm_java",
|
||||
- "//third_party/android_sdk:android_gcm_java",
|
||||
"//third_party/jsr-305:jsr_305_javalib",
|
||||
]
|
||||
|
||||
@@ -791,8 +770,8 @@ diff --git a/components/sync/android/BUILD.gn b/components/sync/android/BUILD.gn
|
||||
@@ -11,7 +11,6 @@ android_library("sync_java") {
|
||||
"//components/signin/core/browser/android:java",
|
||||
"//net/android:net_java",
|
||||
"//third_party/android_deps:android_support_annotations_java",
|
||||
- "//third_party/android_tools:android_gcm_java",
|
||||
"//third_party/android_deps:com_android_support_support_annotations_java",
|
||||
- "//third_party/android_sdk:android_gcm_java",
|
||||
"//third_party/cacheinvalidation:cacheinvalidation_javalib",
|
||||
"//third_party/cacheinvalidation:cacheinvalidation_proto_java",
|
||||
"//third_party/jsr-305:jsr_305_javalib",
|
||||
@@ -803,7 +782,7 @@ diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidat
|
||||
"$google_play_services_package:google_play_services_iid_java",
|
||||
"$google_play_services_package:google_play_services_tasks_java",
|
||||
"//third_party/android_protobuf:protobuf_nano_javalib",
|
||||
- "//third_party/android_tools:android_gcm_java",
|
||||
- "//third_party/android_sdk:android_gcm_java",
|
||||
]
|
||||
|
||||
java_files = [
|
||||
|
||||
@@ -10,7 +10,7 @@ Subject: kill Location, fall back to system
|
||||
diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
|
||||
--- a/services/device/geolocation/BUILD.gn
|
||||
+++ b/services/device/geolocation/BUILD.gn
|
||||
@@ -134,7 +134,6 @@ if (is_android) {
|
||||
@@ -137,7 +137,6 @@ if (is_android) {
|
||||
"android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java",
|
||||
"android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java",
|
||||
"android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java",
|
||||
|
||||
@@ -23,7 +23,7 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
|
||||
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
|
||||
--- a/chrome/android/java/res/values/dimens.xml
|
||||
+++ b/chrome/android/java/res/values/dimens.xml
|
||||
@@ -184,7 +184,6 @@
|
||||
@@ -191,7 +191,6 @@
|
||||
<dimen name="fre_button_padding">12dp</dimen>
|
||||
<dimen name="fre_margin">24dp</dimen>
|
||||
<dimen name="fre_image_height">120dp</dimen>
|
||||
|
||||
@@ -22,10 +22,10 @@ diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/andr
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
|
||||
@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.metrics.UmaUtils;
|
||||
@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.datareduction.DataReductionPromoUtils;
|
||||
import org.chromium.chrome.browser.datareduction.DataReductionProxyUma;
|
||||
import org.chromium.chrome.browser.metrics.UmaUtils;
|
||||
import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
|
||||
import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoUtils;
|
||||
import org.chromium.chrome.browser.preferences.datareduction.DataReductionProxyUma;
|
||||
+import org.chromium.chrome.browser.preferences.PrefServiceBridge;
|
||||
import org.chromium.chrome.browser.search_engines.TemplateUrlService;
|
||||
import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
|
||||
|
||||
@@ -13,7 +13,7 @@ Barcode, face and text detection APIs
|
||||
diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
|
||||
--- a/services/shape_detection/BUILD.gn
|
||||
+++ b/services/shape_detection/BUILD.gn
|
||||
@@ -85,14 +85,10 @@ if (is_android) {
|
||||
@@ -86,14 +86,10 @@ if (is_android) {
|
||||
|
||||
android_library("shape_detection_java") {
|
||||
java_files = [
|
||||
|
||||
@@ -12,7 +12,7 @@ Limit threads auto-detect only for iOS
|
||||
diff --git a/content/renderer/media_recorder/h264_encoder.cc b/content/renderer/media_recorder/h264_encoder.cc
|
||||
--- a/content/renderer/media_recorder/h264_encoder.cc
|
||||
+++ b/content/renderer/media_recorder/h264_encoder.cc
|
||||
@@ -149,11 +149,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
|
||||
@@ -150,11 +150,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
|
||||
init_params.iRCMode = RC_OFF_MODE;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ any information.
|
||||
diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/browser/profile_resetter/reset_report_uploader.cc
|
||||
--- a/chrome/browser/profile_resetter/reset_report_uploader.cc
|
||||
+++ b/chrome/browser/profile_resetter/reset_report_uploader.cc
|
||||
@@ -19,7 +19,7 @@
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
namespace {
|
||||
const char kResetReportUrl[] =
|
||||
|
||||
@@ -22,14 +22,14 @@ References: https://github.com/iridium-browser/iridium-browser/issues/33
|
||||
diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
|
||||
--- a/chrome/browser/signin/signin_promo.cc
|
||||
+++ b/chrome/browser/signin/signin_promo.cc
|
||||
@@ -86,6 +86,7 @@ const char kSigninPromoLandingURLSuccessPage[] = "success.html";
|
||||
|
||||
bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
|
||||
DCHECK(profile);
|
||||
@@ -86,6 +86,7 @@ GURL GetEmbeddedPromoURL(signin_metrics::AccessPoint access_point,
|
||||
url = net::AppendQueryParameter(url, signin::kSignInPromoQueryKeyAutoClose,
|
||||
"1");
|
||||
}
|
||||
+ return false;
|
||||
return url;
|
||||
}
|
||||
|
||||
// Don't show if the profile is an incognito.
|
||||
if (profile->IsOffTheRecord())
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chr
|
||||
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
|
||||
--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
|
||||
+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
|
||||
@@ -761,7 +761,7 @@ void CheckClientDownloadRequest::SendRequest() {
|
||||
@@ -777,7 +777,7 @@ void CheckClientDownloadRequest::SendRequest() {
|
||||
auto resource_request = std::make_unique<network::ResourceRequest>();
|
||||
resource_request->url = PPAPIDownloadRequest::GetDownloadRequestUrl();
|
||||
resource_request->method = "POST";
|
||||
@@ -50,7 +50,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/check_client_downl
|
||||
diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
|
||||
--- a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
|
||||
+++ b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
|
||||
@@ -250,7 +250,7 @@ void PPAPIDownloadRequest::SendRequest() {
|
||||
@@ -251,7 +251,7 @@ void PPAPIDownloadRequest::SendRequest() {
|
||||
auto resource_request = std::make_unique<network::ResourceRequest>();
|
||||
resource_request->url = GetDownloadRequestUrl();
|
||||
resource_request->method = "POST";
|
||||
@@ -73,7 +73,7 @@ diff --git a/components/safe_browsing/browser/threat_details_cache.cc b/componen
|
||||
diff --git a/components/safe_browsing/db/v4_update_protocol_manager.cc b/components/safe_browsing/db/v4_update_protocol_manager.cc
|
||||
--- a/components/safe_browsing/db/v4_update_protocol_manager.cc
|
||||
+++ b/components/safe_browsing/db/v4_update_protocol_manager.cc
|
||||
@@ -343,8 +343,8 @@ void V4UpdateProtocolManager::IssueUpdateRequest() {
|
||||
@@ -373,8 +373,8 @@ void V4UpdateProtocolManager::IssueUpdateRequest() {
|
||||
std::string req_base64 = GetBase64SerializedUpdateRequestProto();
|
||||
GetUpdateUrlAndHeaders(req_base64, &resource_request->url,
|
||||
&resource_request->headers);
|
||||
|
||||
@@ -16,7 +16,7 @@ the URL so we get notified if this happens again in the future).
|
||||
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
|
||||
--- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
|
||||
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
|
||||
@@ -22,7 +22,7 @@ namespace safe_browsing {
|
||||
@@ -23,7 +23,7 @@ namespace safe_browsing {
|
||||
namespace {
|
||||
|
||||
const char kSbIncidentReportUrl[] =
|
||||
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_upl
|
||||
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
|
||||
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
|
||||
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
|
||||
@@ -310,11 +310,14 @@ IncidentReportingService::UploadContext::~UploadContext() {
|
||||
@@ -311,11 +311,14 @@ IncidentReportingService::UploadContext::~UploadContext() {
|
||||
|
||||
// static
|
||||
bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
|
||||
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_
|
||||
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
|
||||
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
|
||||
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
|
||||
@@ -59,8 +59,7 @@ class SafeBrowsingBlockingPageFactoryImpl
|
||||
@@ -62,8 +62,7 @@ class SafeBrowsingBlockingPageFactoryImpl
|
||||
PrefService* prefs =
|
||||
Profile::FromBrowserContext(web_contents->GetBrowserContext())
|
||||
->GetPrefs();
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ Related comment: https://bugs.chromium.org/p/chromium/issues/detail?id=710701#c1
|
||||
diff --git a/third_party/blink/renderer/devtools/BUILD.gn b/third_party/blink/renderer/devtools/BUILD.gn
|
||||
--- a/third_party/blink/renderer/devtools/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/devtools/BUILD.gn
|
||||
@@ -1258,10 +1258,8 @@ action("generate_devtools_grd") {
|
||||
@@ -1274,10 +1274,8 @@ action("generate_devtools_grd") {
|
||||
devtools_embedder_scripts +
|
||||
[ "$resources_out_dir/devtools_extension_api.js" ]
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ See also: https://github.com/Eloston/ungoogled-chromium/issues/104
|
||||
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
|
||||
--- a/chrome/browser/browser_resources.grd
|
||||
+++ b/chrome/browser/browser_resources.grd
|
||||
@@ -384,7 +384,6 @@
|
||||
@@ -392,7 +392,6 @@
|
||||
<include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
|
||||
<include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
|
||||
<include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
|
||||
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
|
||||
<include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
|
||||
<include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
|
||||
<include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
|
||||
@@ -487,7 +486,6 @@
|
||||
@@ -492,7 +491,6 @@
|
||||
<include name="IDR_WEBRTC_LOGS_JS" file="resources\media\webrtc_logs.js" type="BINDATA" />
|
||||
<include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
|
||||
<include name="IDR_CRYPTOTOKEN_MANIFEST" file="resources\cryptotoken\manifest.json" type="BINDATA" />
|
||||
@@ -37,7 +37,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
|
||||
diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
|
||||
--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
|
||||
+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
|
||||
@@ -67,7 +67,6 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
|
||||
@@ -68,7 +68,6 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
|
||||
#endif
|
||||
case IDR_CRYPTOTOKEN_MANIFEST:
|
||||
case IDR_FEEDBACK_MANIFEST:
|
||||
@@ -48,7 +48,7 @@ diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.
|
||||
diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
|
||||
--- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
|
||||
+++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
|
||||
@@ -42,7 +42,7 @@ ComponentLoader* GetComponentLoader(BrowserContext* context) {
|
||||
@@ -43,7 +43,7 @@ ComponentLoader* GetComponentLoader(BrowserContext* context) {
|
||||
|
||||
void LoadGaiaAuthExtension(BrowserContext* context) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
@@ -57,7 +57,7 @@ diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/ch
|
||||
ComponentLoader* component_loader = GetComponentLoader(context);
|
||||
const base::CommandLine* command_line =
|
||||
base::CommandLine::ForCurrentProcess();
|
||||
@@ -55,6 +55,7 @@ void LoadGaiaAuthExtension(BrowserContext* context) {
|
||||
@@ -56,6 +56,7 @@ void LoadGaiaAuthExtension(BrowserContext* context) {
|
||||
|
||||
component_loader->Add(IDR_GAIA_AUTH_MANIFEST,
|
||||
base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
|
||||
@@ -80,7 +80,7 @@ diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome
|
||||
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc
|
||||
--- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
|
||||
@@ -49,7 +49,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
|
||||
@@ -53,7 +53,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
|
||||
|
||||
source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
|
||||
source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);
|
||||
@@ -91,7 +91,7 @@ diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/
|
||||
diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
|
||||
--- a/google_apis/gaia/gaia_auth_fetcher.cc
|
||||
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
|
||||
@@ -44,7 +44,7 @@ namespace {
|
||||
@@ -45,7 +45,7 @@ namespace {
|
||||
const int kLoadFlagsIgnoreCookies = net::LOAD_DO_NOT_SEND_COOKIES |
|
||||
net::LOAD_DO_NOT_SAVE_COOKIES;
|
||||
|
||||
@@ -100,7 +100,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_
|
||||
|
||||
std::unique_ptr<const GaiaAuthConsumer::ClientOAuthResult>
|
||||
ExtractOAuth2TokenPairResponse(const std::string& data) {
|
||||
@@ -260,6 +260,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
|
||||
@@ -261,6 +261,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
|
||||
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
|
||||
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
|
||||
|
||||
@@ -108,7 +108,7 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_
|
||||
auto resource_request = std::make_unique<network::ResourceRequest>();
|
||||
resource_request->url = gaia_gurl;
|
||||
original_url_ = gaia_gurl;
|
||||
@@ -314,6 +315,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
|
||||
@@ -315,6 +316,7 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
|
||||
base::BindOnce(&GaiaAuthFetcher::OnURLLoadComplete,
|
||||
base::Unretained(this)),
|
||||
kMaxMessageSize);
|
||||
|
||||
@@ -323,11 +323,11 @@ diff --git a/components/google/core/common/google_util.cc b/components/google/co
|
||||
+ return false;
|
||||
}
|
||||
|
||||
const std::vector<std::string>& GetGoogleRegistrableDomains() {
|
||||
bool IsGoogleAssociatedDomainUrl(const GURL& url) {
|
||||
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
|
||||
--- a/components/search_engines/template_url.cc
|
||||
+++ b/components/search_engines/template_url.cc
|
||||
@@ -504,11 +504,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
|
||||
@@ -505,11 +505,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
|
||||
bool TemplateURLRef::HasGoogleBaseURLs(
|
||||
const SearchTermsData& search_terms_data) const {
|
||||
ParseIfNecessary(search_terms_data);
|
||||
@@ -343,7 +343,7 @@ diff --git a/components/search_engines/template_url.cc b/components/search_engin
|
||||
diff --git a/net/base/url_util.cc b/net/base/url_util.cc
|
||||
--- a/net/base/url_util.cc
|
||||
+++ b/net/base/url_util.cc
|
||||
@@ -383,28 +383,6 @@ void GetIdentityFromURL(const GURL& url,
|
||||
@@ -392,28 +392,6 @@ void GetIdentityFromURL(const GURL& url,
|
||||
}
|
||||
|
||||
bool HasGoogleHost(const GURL& url) {
|
||||
|
||||
@@ -71,7 +71,7 @@ diff --git a/components/domain_reliability/BUILD.gn b/components/domain_reliabil
|
||||
diff --git a/components/domain_reliability/bake_in_configs.py b/components/domain_reliability/bake_in_configs.py
|
||||
--- a/components/domain_reliability/bake_in_configs.py
|
||||
+++ b/components/domain_reliability/bake_in_configs.py
|
||||
@@ -489,7 +489,7 @@ def origin_is_whitelisted(origin):
|
||||
@@ -490,7 +490,7 @@ def origin_is_whitelisted(origin):
|
||||
domain = origin[8:-1]
|
||||
else:
|
||||
return False
|
||||
|
||||
@@ -12,7 +12,7 @@ Added some Bromite-specific further improvements
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -1289,8 +1289,6 @@ jumbo_split_static_library("browser") {
|
||||
@@ -1363,8 +1363,6 @@ jumbo_split_static_library("browser") {
|
||||
"profiles/profile_attributes_entry.h",
|
||||
"profiles/profile_attributes_storage.cc",
|
||||
"profiles/profile_attributes_storage.h",
|
||||
|
||||
+84
-91
@@ -1,33 +1,33 @@
|
||||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Tue, 16 Oct 2018 05:22:59 +0200
|
||||
Subject: ungoogled-chromium: disable safe browsing
|
||||
Subject: ungoogled-chromium: Disable safe browsing
|
||||
|
||||
---
|
||||
chrome/browser/BUILD.gn | 2 -
|
||||
chrome/browser/browser_process.h | 16 -----
|
||||
chrome/browser/browser_process_impl.cc | 29 ---------
|
||||
chrome/browser/browser_process_impl.h | 6 --
|
||||
.../chrome_browsing_data_remover_delegate.cc | 29 ---------
|
||||
.../chrome_browsing_data_remover_delegate.cc | 30 ---------
|
||||
chrome/browser/chrome_content_browser_client.cc | 32 +---------
|
||||
.../file_type_policies_component_installer.cc | 14 -----
|
||||
.../download/chrome_download_manager_delegate.cc | 17 -----
|
||||
.../download/chrome_download_manager_delegate.cc | 17 ------
|
||||
chrome/browser/download/download_item_model.cc | 3 -
|
||||
chrome/browser/download/download_prefs.cc | 13 +---
|
||||
.../browser/download/download_target_determiner.cc | 24 +------
|
||||
.../browser/download/download_target_determiner.cc | 24 +-------
|
||||
.../extensions/api/downloads/downloads_api.cc | 39 +-----------
|
||||
.../extensions/api/downloads/downloads_api.h | 10 ---
|
||||
.../api/webstore_private/webstore_private_api.cc | 43 +------------
|
||||
.../browser/extensions/blacklist_state_fetcher.cc | 34 ++--------
|
||||
.../api/webstore_private/webstore_private_api.cc | 44 +-------------
|
||||
.../browser/extensions/blacklist_state_fetcher.cc | 34 ++---------
|
||||
.../browser/extensions/blacklist_state_fetcher.h | 3 -
|
||||
.../chrome_resource_dispatcher_host_delegate.cc | 7 +--
|
||||
.../chrome_resource_dispatcher_host_delegate.cc | 5 +-
|
||||
.../metrics/chrome_metrics_service_client.cc | 3 -
|
||||
.../browser/net/trial_comparison_cert_verifier.cc | 3 -
|
||||
.../trial_comparison_cert_verifier_controller.cc | 3 -
|
||||
.../chrome_browser_main_extra_parts_profiles.cc | 1 -
|
||||
chrome/browser/profiles/profile_impl.cc | 14 +----
|
||||
chrome/browser/safe_browsing/BUILD.gn | 2 +
|
||||
chrome/browser/ssl/captive_portal_blocking_page.cc | 7 +--
|
||||
chrome/browser/ssl/cert_report_helper.cc | 2 -
|
||||
chrome/browser/ssl/security_state_tab_helper.cc | 73 ----------------------
|
||||
chrome/browser/ssl/security_state_tab_helper.cc | 71 ----------------------
|
||||
.../chrome_subresource_filter_client.cc | 14 -----
|
||||
chrome/browser/ui/BUILD.gn | 1 -
|
||||
chrome/browser/ui/tab_helpers.cc | 22 +++----
|
||||
@@ -35,12 +35,12 @@ Subject: ungoogled-chromium: disable safe browsing
|
||||
chrome/renderer/chrome_content_renderer_client.cc | 1 -
|
||||
components/safe_browsing/features.cc | 2 +-
|
||||
.../core/browser/subresource_filter_features.cc | 2 +-
|
||||
32 files changed, 33 insertions(+), 446 deletions(-)
|
||||
32 files changed, 32 insertions(+), 445 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2696,8 +2696,6 @@ jumbo_split_static_library("browser") {
|
||||
@@ -2828,8 +2828,6 @@ jumbo_split_static_library("browser") {
|
||||
"download/download_commands.h",
|
||||
"download/download_crx_util.cc",
|
||||
"download/download_crx_util.h",
|
||||
@@ -98,9 +98,9 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
|
||||
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
|
||||
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
||||
#include "chrome/browser/shell_integration.h"
|
||||
#include "chrome/browser/status_icons/status_tray.h"
|
||||
#include "chrome/browser/ui/browser_dialogs.h"
|
||||
@@ -369,8 +368,6 @@ void BrowserProcessImpl::StartTearDown() {
|
||||
#include "chrome/browser/site_isolation/prefs_observer.h"
|
||||
#include "chrome/browser/startup_data.h"
|
||||
@@ -386,8 +385,6 @@ void BrowserProcessImpl::StartTearDown() {
|
||||
// that URLFetcher operation before going away.)
|
||||
metrics_services_manager_.reset();
|
||||
intranet_redirect_detector_.reset();
|
||||
@@ -109,7 +109,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
|
||||
network_time_tracker_.reset();
|
||||
#if BUILDFLAG(ENABLE_PLUGINS)
|
||||
plugins_resource_service_.reset();
|
||||
@@ -992,22 +989,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
|
||||
@@ -1008,22 +1005,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
|
||||
return status_tray_.get();
|
||||
}
|
||||
|
||||
@@ -132,7 +132,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
|
||||
subresource_filter::RulesetService*
|
||||
BrowserProcessImpl::subresource_filter_ruleset_service() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
@@ -1292,16 +1273,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
|
||||
@@ -1311,16 +1292,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
|
||||
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
|
||||
--- a/chrome/browser/browser_process_impl.h
|
||||
+++ b/chrome/browser/browser_process_impl.h
|
||||
@@ -172,9 +172,6 @@ class BrowserProcessImpl : public BrowserProcess,
|
||||
@@ -173,9 +173,6 @@ class BrowserProcessImpl : public BrowserProcess,
|
||||
void set_background_mode_manager_for_test(
|
||||
std::unique_ptr<BackgroundModeManager> manager) override;
|
||||
StatusTray* status_tray() override;
|
||||
@@ -162,7 +162,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
|
||||
subresource_filter::RulesetService* subresource_filter_ruleset_service()
|
||||
override;
|
||||
optimization_guide::OptimizationGuideService* optimization_guide_service()
|
||||
@@ -320,9 +317,6 @@ class BrowserProcessImpl : public BrowserProcess,
|
||||
@@ -321,9 +318,6 @@ class BrowserProcessImpl : public BrowserProcess,
|
||||
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
|
||||
#endif
|
||||
|
||||
@@ -175,7 +175,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
|
||||
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
@@ -628,35 +628,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
|
||||
@@ -639,36 +639,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
|
||||
CONTENT_SETTINGS_TYPE_CLIENT_HINTS, base::Time(), base::Time::Max(),
|
||||
website_settings_filter);
|
||||
|
||||
@@ -202,9 +202,10 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
|
||||
-
|
||||
- manager_ptr->DeleteCookies(
|
||||
- std::move(deletion_filter),
|
||||
- base::BindOnce(&OnClearedCookies,
|
||||
- CreatePendingTaskCompletionClosure(),
|
||||
- std::move(cookie_manager)));
|
||||
- base::BindOnce(
|
||||
- &OnClearedCookies,
|
||||
- CreateTaskCompletionClosure(TracingDataType::kCookies),
|
||||
- std::move(cookie_manager)));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
@@ -214,7 +215,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
|
||||
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -853,30 +853,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
|
||||
@@ -887,30 +887,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
|
||||
GetIOThreadApplicationLocale() = locale;
|
||||
}
|
||||
|
||||
@@ -245,7 +246,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
#if defined(OS_ANDROID)
|
||||
float GetDeviceScaleAdjustment() {
|
||||
static const float kMinFSM = 1.05f;
|
||||
@@ -2052,7 +2028,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
|
||||
@@ -2120,7 +2096,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
|
||||
// Disable client-side phishing detection in the renderer if it is
|
||||
// disabled in the Profile preferences or the browser process.
|
||||
if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
|
||||
@@ -254,7 +255,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
command_line->AppendSwitch(
|
||||
switches::kDisableClientSidePhishingDetection);
|
||||
}
|
||||
@@ -2747,7 +2723,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
|
||||
@@ -2779,7 +2755,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
|
||||
SSLErrorHandler::HandleSSLError(
|
||||
web_contents, cert_error, ssl_info, request_url,
|
||||
expired_previous_decision,
|
||||
@@ -263,7 +264,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
callback, SSLErrorHandler::BlockingPageReadyCallback());
|
||||
}
|
||||
|
||||
@@ -3030,8 +3006,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
|
||||
@@ -3066,8 +3042,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
|
||||
void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
|
||||
@@ -272,7 +273,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
|
||||
for (size_t i = 0; i < extra_parts_.size(); ++i)
|
||||
extra_parts_[i]->ResourceDispatcherHostCreated();
|
||||
|
||||
@@ -4250,7 +4224,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
|
||||
@@ -4340,7 +4314,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
|
||||
if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) {
|
||||
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
|
||||
handle,
|
||||
@@ -308,7 +309,7 @@ diff --git a/chrome/browser/component_updater/file_type_policies_component_insta
|
||||
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
|
||||
@@ -322,13 +322,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
|
||||
@@ -319,13 +319,6 @@ ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
|
||||
|
||||
void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
|
||||
download_manager_ = dm;
|
||||
@@ -355,7 +356,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
|
||||
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
|
||||
--- a/chrome/browser/download/download_prefs.cc
|
||||
+++ b/chrome/browser/download/download_prefs.cc
|
||||
@@ -219,14 +219,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profile_(profile) {
|
||||
@@ -224,14 +224,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profile_(profile) {
|
||||
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
|
||||
extension);
|
||||
|
||||
@@ -385,7 +386,7 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download
|
||||
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -988,29 +988,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
|
||||
@@ -1028,29 +1028,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
|
||||
download_->HasUserGesture())
|
||||
return DownloadFileType::NOT_DANGEROUS;
|
||||
|
||||
@@ -487,9 +488,9 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/br
|
||||
#include "base/scoped_observer.h"
|
||||
#include "base/time/time.h"
|
||||
-#include "chrome/browser/download/download_danger_prompt.h"
|
||||
#include "chrome/browser/download/download_path_reservation_tracker.h"
|
||||
#include "chrome/browser/extensions/chrome_extension_function.h"
|
||||
#include "chrome/common/extensions/api/downloads.h"
|
||||
#include "components/download/content/public/all_download_item_notifier.h"
|
||||
@@ -189,25 +188,16 @@ class DownloadsRemoveFileFunction : public ChromeAsyncExtensionFunction {
|
||||
|
||||
class DownloadsAcceptDangerFunction : public ChromeAsyncExtensionFunction {
|
||||
@@ -519,18 +520,21 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/br
|
||||
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
@@ -682,48 +682,7 @@ WebstorePrivateGetReferrerChainFunction::
|
||||
@@ -681,51 +681,9 @@ WebstorePrivateGetReferrerChainFunction::
|
||||
|
||||
ExtensionFunction::ResponseAction
|
||||
WebstorePrivateGetReferrerChainFunction::Run() {
|
||||
- Profile* profile = chrome_details_.GetProfile();
|
||||
- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(profile))
|
||||
- return RespondNow(ArgumentList(GetReferrerChain::Results::Create("")));
|
||||
- return RespondNow(ArgumentList(
|
||||
- api::webstore_private::GetReferrerChain::Results::Create("")));
|
||||
-
|
||||
- content::WebContents* web_contents = GetSenderWebContents();
|
||||
- if (!web_contents) {
|
||||
- return RespondNow(ErrorWithArguments(GetReferrerChain::Results::Create(""),
|
||||
- kWebstoreUserCancelledError));
|
||||
- return RespondNow(ErrorWithArguments(
|
||||
+ return RespondNow(ErrorWithArguments(
|
||||
api::webstore_private::GetReferrerChain::Results::Create(""),
|
||||
kWebstoreUserCancelledError));
|
||||
- }
|
||||
-
|
||||
- scoped_refptr<SafeBrowsingNavigationObserverManager>
|
||||
@@ -563,16 +567,16 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
|
||||
- // Base64 encode the proto to avoid issues with base::Value rejecting strings
|
||||
- // which are not valid UTF8.
|
||||
- base::Base64Encode(serialized_referrer_proto, &serialized_referrer_proto);
|
||||
- return RespondNow(ArgumentList(
|
||||
- GetReferrerChain::Results::Create(serialized_referrer_proto)));
|
||||
+ return RespondNow(ArgumentList(GetReferrerChain::Results::Create("")));
|
||||
- return RespondNow(
|
||||
- ArgumentList(api::webstore_private::GetReferrerChain::Results::Create(
|
||||
- serialized_referrer_proto)));
|
||||
}
|
||||
|
||||
} // namespace extensions
|
||||
diff --git a/chrome/browser/extensions/blacklist_state_fetcher.cc b/chrome/browser/extensions/blacklist_state_fetcher.cc
|
||||
--- a/chrome/browser/extensions/blacklist_state_fetcher.cc
|
||||
+++ b/chrome/browser/extensions/blacklist_state_fetcher.cc
|
||||
@@ -31,28 +31,9 @@ BlacklistStateFetcher::~BlacklistStateFetcher() {
|
||||
@@ -32,28 +32,9 @@ BlacklistStateFetcher::~BlacklistStateFetcher() {
|
||||
void BlacklistStateFetcher::Request(const std::string& id,
|
||||
const RequestCallback& callback) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
@@ -604,7 +608,7 @@ diff --git a/chrome/browser/extensions/blacklist_state_fetcher.cc b/chrome/brows
|
||||
}
|
||||
|
||||
void BlacklistStateFetcher::SendRequest(const std::string& id) {
|
||||
@@ -63,8 +44,7 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) {
|
||||
@@ -64,8 +45,7 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) {
|
||||
std::string request_str;
|
||||
request.SerializeToString(&request_str);
|
||||
|
||||
@@ -614,7 +618,7 @@ diff --git a/chrome/browser/extensions/blacklist_state_fetcher.cc b/chrome/brows
|
||||
net::NetworkTrafficAnnotationTag traffic_annotation =
|
||||
net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
|
||||
semantics {
|
||||
@@ -111,12 +91,6 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) {
|
||||
@@ -112,12 +92,6 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) {
|
||||
base::Unretained(this), fetcher));
|
||||
}
|
||||
|
||||
@@ -669,19 +673,10 @@ diff --git a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc b
|
||||
ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
|
||||
|
||||
#if BUILDFLAG(ENABLE_OFFLINE_PAGES) || BUILDFLAG(ENABLE_NACL)
|
||||
@@ -410,7 +407,7 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
|
||||
content::ResourceThrottle* first_throttle = NULL;
|
||||
#if defined(OS_ANDROID)
|
||||
first_throttle = DataReductionProxyResourceThrottle::MaybeCreate(
|
||||
- request, resource_context, resource_type, safe_browsing_.get());
|
||||
+ request, resource_context, resource_type, nullptr);
|
||||
#endif // defined(OS_ANDROID)
|
||||
|
||||
#if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
|
||||
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
|
||||
@@ -714,9 +714,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
|
||||
@@ -695,9 +695,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
|
||||
metrics_service_->RegisterMetricsProvider(
|
||||
std::make_unique<HttpsEngagementMetricsProvider>());
|
||||
|
||||
@@ -691,23 +686,23 @@ diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/br
|
||||
#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
||||
metrics_service_->RegisterMetricsProvider(
|
||||
std::make_unique<UpgradeMetricsProvider>());
|
||||
diff --git a/chrome/browser/net/trial_comparison_cert_verifier.cc b/chrome/browser/net/trial_comparison_cert_verifier.cc
|
||||
--- a/chrome/browser/net/trial_comparison_cert_verifier.cc
|
||||
+++ b/chrome/browser/net/trial_comparison_cert_verifier.cc
|
||||
@@ -80,9 +80,6 @@ void SendTrialVerificationReport(void* profile_id,
|
||||
diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
|
||||
--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
|
||||
+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
|
||||
@@ -112,9 +112,6 @@ void TrialComparisonCertVerifierController::SendTrialReport(
|
||||
std::string serialized_report;
|
||||
if (!report.Serialize(&serialized_report))
|
||||
return;
|
||||
-
|
||||
- CertificateReportingServiceFactory::GetForBrowserContext(profile)->Send(
|
||||
- CertificateReportingServiceFactory::GetForBrowserContext(profile_)->Send(
|
||||
- serialized_report);
|
||||
}
|
||||
|
||||
std::unique_ptr<base::Value> TrialVerificationJobResultCallback(
|
||||
// static
|
||||
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -239,7 +239,6 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
@@ -238,7 +238,6 @@ void ChromeBrowserMainExtraPartsProfiles::
|
||||
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
|
||||
CaptivePortalServiceFactory::GetInstance();
|
||||
#endif
|
||||
@@ -718,7 +713,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
||||
--- a/chrome/browser/profiles/profile_impl.cc
|
||||
+++ b/chrome/browser/profiles/profile_impl.cc
|
||||
@@ -589,18 +589,6 @@ ProfileImpl::ProfileImpl(
|
||||
@@ -562,18 +562,6 @@ ProfileImpl::ProfileImpl(
|
||||
create_mode == CREATE_MODE_SYNCHRONOUS);
|
||||
#endif
|
||||
|
||||
@@ -737,7 +732,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
|
||||
content::BrowserContext::Initialize(this, path_);
|
||||
|
||||
{
|
||||
@@ -609,7 +597,7 @@ ProfileImpl::ProfileImpl(
|
||||
@@ -582,7 +570,7 @@ ProfileImpl::ProfileImpl(
|
||||
->CreateDelegate();
|
||||
delegate->InitPrefRegistry(pref_registry_.get());
|
||||
prefs_ = chrome_prefs::CreateProfilePrefs(
|
||||
@@ -749,15 +744,15 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
|
||||
diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
|
||||
--- a/chrome/browser/safe_browsing/BUILD.gn
|
||||
+++ b/chrome/browser/safe_browsing/BUILD.gn
|
||||
@@ -6,6 +6,7 @@ import("//extensions/buildflags/buildflags.gni")
|
||||
import("//third_party/protobuf/proto_library.gni")
|
||||
@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
|
||||
import("//extensions/buildflags/buildflags.gni")
|
||||
|
||||
static_library("safe_browsing") {
|
||||
jumbo_static_library("safe_browsing") {
|
||||
+ if (false) {
|
||||
sources = [
|
||||
"safe_browsing_controller_client.cc",
|
||||
"safe_browsing_controller_client.h",
|
||||
@@ -100,6 +101,7 @@ static_library("safe_browsing") {
|
||||
@@ -100,6 +101,7 @@ jumbo_static_library("safe_browsing") {
|
||||
} else {
|
||||
sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win_noop.cc" ]
|
||||
}
|
||||
@@ -804,7 +799,7 @@ diff --git a/chrome/browser/ssl/cert_report_helper.cc b/chrome/browser/ssl/cert_
|
||||
diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
|
||||
--- a/chrome/browser/ssl/security_state_tab_helper.cc
|
||||
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
|
||||
@@ -186,79 +186,6 @@ bool SecurityStateTabHelper::UsedPolicyInstalledCertificate() const {
|
||||
@@ -195,77 +195,6 @@ bool SecurityStateTabHelper::UsedPolicyInstalledCertificate() const {
|
||||
|
||||
security_state::MaliciousContentStatus
|
||||
SecurityStateTabHelper::GetMaliciousContentStatus() const {
|
||||
@@ -832,7 +827,7 @@ diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ss
|
||||
- case safe_browsing::SB_THREAT_TYPE_URL_UNWANTED:
|
||||
- return security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE;
|
||||
- case safe_browsing::SB_THREAT_TYPE_SIGN_IN_PASSWORD_REUSE:
|
||||
-#if defined(SAFE_BROWSING_DB_LOCAL)
|
||||
-#if defined(FULL_SAFE_BROWSING)
|
||||
- if (safe_browsing::ChromePasswordProtectionService::
|
||||
- ShouldShowPasswordReusePageInfoBubble(
|
||||
- web_contents(),
|
||||
@@ -846,7 +841,7 @@ diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ss
|
||||
- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
|
||||
-#endif
|
||||
- case safe_browsing::SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE:
|
||||
-#if defined(SAFE_BROWSING_DB_LOCAL)
|
||||
-#if defined(FULL_SAFE_BROWSING)
|
||||
- if (safe_browsing::ChromePasswordProtectionService::
|
||||
- ShouldShowPasswordReusePageInfoBubble(
|
||||
- web_contents(),
|
||||
@@ -860,9 +855,7 @@ diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ss
|
||||
- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
|
||||
-#endif
|
||||
- case safe_browsing::SB_THREAT_TYPE_BILLING:
|
||||
- return base::FeatureList::IsEnabled(safe_browsing::kBillingInterstitial)
|
||||
- ? security_state::MALICIOUS_CONTENT_STATUS_BILLING
|
||||
- : security_state::MALICIOUS_CONTENT_STATUS_NONE;
|
||||
- return security_state::MALICIOUS_CONTENT_STATUS_BILLING;
|
||||
- case safe_browsing::
|
||||
- DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING:
|
||||
- case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE:
|
||||
@@ -911,8 +904,8 @@ diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -2463,7 +2463,6 @@ jumbo_split_static_library("ui") {
|
||||
"views/cookie_info_view.h",
|
||||
@@ -2514,7 +2514,6 @@ jumbo_split_static_library("ui") {
|
||||
"views/desktop_capture/desktop_media_tab_list.h",
|
||||
"views/device_chooser_content_view.cc",
|
||||
"views/device_chooser_content_view.h",
|
||||
- "views/download/download_danger_prompt_views.cc",
|
||||
@@ -922,7 +915,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
|
||||
--- a/chrome/browser/ui/tab_helpers.cc
|
||||
+++ b/chrome/browser/ui/tab_helpers.cc
|
||||
@@ -44,8 +44,8 @@
|
||||
@@ -47,8 +47,8 @@
|
||||
#include "chrome/browser/previews/resource_loading_hints/resource_loading_hints_web_contents_observer.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/resource_coordinator/tab_helper.h"
|
||||
@@ -933,7 +926,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
|
||||
#include "chrome/browser/sessions/session_tab_helper.h"
|
||||
#include "chrome/browser/ssl/connection_help_tab_helper.h"
|
||||
#include "chrome/browser/ssl/security_state_tab_helper.h"
|
||||
@@ -105,7 +105,7 @@
|
||||
@@ -106,7 +106,7 @@
|
||||
#else
|
||||
#include "chrome/browser/banners/app_banner_manager_desktop.h"
|
||||
#include "chrome/browser/plugins/plugin_observer.h"
|
||||
@@ -942,7 +935,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
|
||||
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
|
||||
#include "chrome/browser/ui/hung_plugin_tab_helper.h"
|
||||
#include "chrome/browser/ui/sad_tab_helper.h"
|
||||
@@ -200,10 +200,10 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
|
||||
@@ -198,10 +198,10 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
|
||||
ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
|
||||
web_contents,
|
||||
autofill::ChromeAutofillClient::FromWebContents(web_contents));
|
||||
@@ -957,7 +950,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
|
||||
ChromeTranslateClient::CreateForWebContents(web_contents);
|
||||
ClientHintsObserver::CreateForWebContents(web_contents);
|
||||
ConnectionHelpTabHelper::CreateForWebContents(web_contents);
|
||||
@@ -243,10 +243,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
|
||||
@@ -242,10 +242,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
|
||||
PreviewsUITabHelper::CreateForWebContents(web_contents);
|
||||
RecentlyAudibleHelper::CreateForWebContents(web_contents);
|
||||
ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);
|
||||
@@ -970,27 +963,27 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
|
||||
SearchEngineTabHelper::CreateForWebContents(web_contents);
|
||||
SecurityStateTabHelper::CreateForWebContents(web_contents);
|
||||
if (SiteEngagementService::IsEnabled())
|
||||
@@ -299,7 +297,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
|
||||
new ChromePDFWebContentsHelperClient()));
|
||||
@@ -295,7 +293,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
|
||||
web_contents, std::make_unique<ChromePDFWebContentsHelperClient>());
|
||||
PluginObserver::CreateForWebContents(web_contents);
|
||||
SadTabHelper::CreateForWebContents(web_contents);
|
||||
- safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(web_contents);
|
||||
+ //safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(web_contents);
|
||||
SearchTabHelper::CreateForWebContents(web_contents);
|
||||
TabDialogs::CreateForWebContents(web_contents);
|
||||
web_modal::WebContentsModalDialogManager::CreateForWebContents(web_contents);
|
||||
if (base::FeatureList::IsEnabled(features::kTabHoverCardImages))
|
||||
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
||||
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
||||
@@ -250,6 +250,7 @@ BadClockBlockingPage* CreateBadClockBlockingPage(
|
||||
base::Callback<void(content::CertificateRequestResultType)>());
|
||||
@@ -267,6 +267,7 @@ LookalikeUrlInterstitialPage* CreateLookalikeInterstitialPage(
|
||||
safe_url));
|
||||
}
|
||||
|
||||
+#if 0
|
||||
safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
|
||||
content::WebContents* web_contents) {
|
||||
safe_browsing::SBThreatType threat_type =
|
||||
@@ -308,7 +309,9 @@ safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
|
||||
@@ -325,7 +326,9 @@ safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
|
||||
g_browser_process->safe_browsing_service()->ui_manager().get(),
|
||||
web_contents, main_frame_url, resource);
|
||||
}
|
||||
@@ -1000,7 +993,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
|
||||
TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage(
|
||||
content::WebContents* web_contents) {
|
||||
safe_browsing::SBThreatType threat_type =
|
||||
@@ -360,6 +363,7 @@ TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage(
|
||||
@@ -377,6 +380,7 @@ TestSafeBrowsingBlockingPageQuiet* CreateSafeBrowsingQuietBlockingPage(
|
||||
g_browser_process->safe_browsing_service()->ui_manager().get(),
|
||||
web_contents, main_frame_url, resource, is_giant_webview);
|
||||
}
|
||||
@@ -1008,7 +1001,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
|
||||
|
||||
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
|
||||
CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
|
||||
@@ -460,8 +464,6 @@ void InterstitialHTMLSource::StartDataRequest(
|
||||
@@ -484,8 +488,6 @@ void InterstitialHTMLSource::StartDataRequest(
|
||||
interstitial_delegate.reset(CreateSSLBlockingPage(web_contents));
|
||||
} else if (path_without_query == "/mitm-software-ssl") {
|
||||
interstitial_delegate.reset(CreateMITMSoftwareBlockingPage(web_contents));
|
||||
@@ -1016,8 +1009,8 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
|
||||
- interstitial_delegate.reset(CreateSafeBrowsingBlockingPage(web_contents));
|
||||
} else if (path_without_query == "/clock") {
|
||||
interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents));
|
||||
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
|
||||
@@ -472,11 +474,6 @@ void InterstitialHTMLSource::StartDataRequest(
|
||||
} else if (path_without_query == "/lookalike") {
|
||||
@@ -501,11 +503,6 @@ void InterstitialHTMLSource::StartDataRequest(
|
||||
|
||||
if (path_without_query == "/supervised_user") {
|
||||
html = GetSupervisedUserInterstitialHTML(path);
|
||||
@@ -1032,7 +1025,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
|
||||
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
||||
--- a/chrome/renderer/chrome_content_renderer_client.cc
|
||||
+++ b/chrome/renderer/chrome_content_renderer_client.cc
|
||||
@@ -81,7 +81,6 @@
|
||||
@@ -84,7 +84,6 @@
|
||||
#include "components/error_page/common/localized_error.h"
|
||||
#include "components/network_hints/renderer/prescient_networking_dispatcher.h"
|
||||
#include "components/pdf/renderer/pepper_pdf_host.h"
|
||||
@@ -1043,19 +1036,19 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
|
||||
diff --git a/components/safe_browsing/features.cc b/components/safe_browsing/features.cc
|
||||
--- a/components/safe_browsing/features.cc
|
||||
+++ b/components/safe_browsing/features.cc
|
||||
@@ -44,7 +44,7 @@ const base::Feature kForceEnableResetPasswordWebUI{
|
||||
"ForceEnableResetPasswordWebUI", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
@@ -43,7 +43,7 @@ const base::Feature kPasswordProtectionForSignedInUsers{
|
||||
base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
|
||||
const base::Feature kSuspiciousSiteTriggerQuotaFeature{
|
||||
- "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
+ "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
|
||||
const base::Feature kTelemetryForApkDownloads{
|
||||
"SafeBrowsingTelemetryForApkDownloads", base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
"SafeBrowsingTelemetryForApkDownloads", base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
|
||||
--- a/components/subresource_filter/core/browser/subresource_filter_features.cc
|
||||
+++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
|
||||
@@ -230,7 +230,7 @@ base::LazyInstance<scoped_refptr<ConfigurationList>>::Leaky
|
||||
@@ -231,7 +231,7 @@ base::LazyInstance<scoped_refptr<ConfigurationList>>::Leaky
|
||||
// Constant definitions -------------------------------------------------------
|
||||
|
||||
const base::Feature kSafeBrowsingSubresourceFilter{
|
||||
@@ -10,9 +10,9 @@ Subject: ungoogled-chromium: Disable translate integration
|
||||
diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc
|
||||
--- a/components/translate/core/browser/translate_manager.cc
|
||||
+++ b/components/translate/core/browser/translate_manager.cc
|
||||
@@ -664,8 +664,9 @@ void TranslateManager::FilterIsTranslatePossible(
|
||||
if (net::NetworkChangeNotifier::IsOffline())
|
||||
decision->PreventAllTriggering();
|
||||
@@ -670,8 +670,9 @@ void TranslateManager::FilterIsTranslatePossible(
|
||||
TranslateBrowserMetrics::INITIATION_STATUS_NO_NETWORK);
|
||||
}
|
||||
|
||||
- if (!ignore_missing_key_for_testing_ &&
|
||||
- !::google_apis::HasAPIKeyConfigured()) {
|
||||
|
||||
@@ -16,7 +16,7 @@ Disable additional URLs that are not caught by the "trk" scheme
|
||||
diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc
|
||||
--- a/chrome/browser/android/rlz/rlz_ping_handler.cc
|
||||
+++ b/chrome/browser/android/rlz/rlz_ping_handler.cc
|
||||
@@ -75,7 +75,7 @@ void RlzPingHandler::Ping(
|
||||
@@ -76,7 +76,7 @@ void RlzPingHandler::Ping(
|
||||
DCHECK_EQ(id.length(), 50u);
|
||||
|
||||
GURL request_url(base::StringPrintf(
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user