Patches for 138 (final)
This commit is contained in:
@@ -21,14 +21,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
.../chrome/browser/app/ChromeActivity.java | 1 +
|
||||
.../init/ChromeBrowserInitializer.java | 3 +
|
||||
.../PrivacyPreferencesManagerImpl.java | 42 ++++
|
||||
.../settings/UserAgentPreferences.java | 183 ++++++++++++++++++
|
||||
.../settings/UserAgentPreferences.java | 189 ++++++++++++++++++
|
||||
.../browser/tab/RequestDesktopUtils.java | 1 +
|
||||
.../chromium/chrome/browser/tab/TabImpl.java | 64 +++++-
|
||||
.../chromium/chrome/browser/tab/TabUtils.java | 7 +-
|
||||
.../browser/android/content/content_utils.cc | 32 ++-
|
||||
.../preferences/browser_prefs_android.cc | 7 +
|
||||
.../privacy_preferences_manager_impl.cc | 126 ++++++++++++
|
||||
...ktop_site_web_contents_observer_android.cc | 11 ++
|
||||
...ktop_site_web_contents_observer_android.cc | 11 +
|
||||
...sktop_site_web_contents_observer_android.h | 2 +
|
||||
.../preferences/ChromePreferenceKeys.java | 2 -
|
||||
.../settings/PrivacyPreferencesManager.java | 8 +
|
||||
@@ -37,16 +37,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
.../tabwindow/TabWindowManagerImpl.java | 18 ++
|
||||
.../strings/android_chrome_strings.grd | 26 +++
|
||||
chrome/common/pref_names.h | 8 +
|
||||
...omiteRequestDesktopSiteContentSetting.java | 76 ++++++++
|
||||
...omiteRequestDesktopSiteContentSetting.java | 76 +++++++
|
||||
.../request_desktop_site.grdp | 18 ++
|
||||
.../widget/RadioButtonWithEditText.java | 11 ++
|
||||
.../widget/RadioButtonWithEditText.java | 11 +
|
||||
.../navigation_controller_android.cc | 4 +
|
||||
.../navigation_controller_android.h | 1 +
|
||||
.../renderer_host/render_process_host_impl.cc | 1 +
|
||||
.../browser/web_contents/web_contents_impl.cc | 6 +-
|
||||
.../framehost/NavigationControllerImpl.java | 3 +-
|
||||
content/renderer/render_thread_impl.cc | 1 -
|
||||
36 files changed, 794 insertions(+), 17 deletions(-)
|
||||
36 files changed, 800 insertions(+), 17 deletions(-)
|
||||
create mode 100644 chrome/android/java/res/layout/custom_useragent_preferences.xml
|
||||
create mode 100644 chrome/android/java/res/xml/useragent_preferences.xml
|
||||
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/UserAgentPreferences.java
|
||||
@@ -364,7 +364,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/UserAg
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/UserAgentPreferences.java
|
||||
@@ -0,0 +1,183 @@
|
||||
@@ -0,0 +1,189 @@
|
||||
+/*
|
||||
+ This file is part of Bromite.
|
||||
+
|
||||
@@ -408,6 +408,7 @@ new file mode 100644
|
||||
+import org.chromium.components.browser_ui.settings.SettingsUtils;
|
||||
+import org.chromium.components.content_settings.ContentSettingsType;
|
||||
+import org.chromium.components.browser_ui.site_settings.WebsitePreferenceBridge;
|
||||
+import org.chromium.components.browser_ui.settings.SettingsFragment;
|
||||
+import org.chromium.chrome.browser.app.tabwindow.TabWindowManagerSingleton;
|
||||
+import org.chromium.chrome.browser.tabwindow.TabWindowManager;
|
||||
+import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
|
||||
@@ -420,7 +421,7 @@ new file mode 100644
|
||||
+ */
|
||||
+public class UserAgentPreferences
|
||||
+ extends PreferenceFragmentCompat
|
||||
+ implements RadioGroup.OnCheckedChangeListener,
|
||||
+ implements RadioGroup.OnCheckedChangeListener, SettingsFragment,
|
||||
+ ProfileDependentSetting {
|
||||
+
|
||||
+ private RadioButtonWithDescription useDefaultAgentSwitch;
|
||||
@@ -433,6 +434,11 @@ new file mode 100644
|
||||
+ private Profile mProfile;
|
||||
+
|
||||
+ @Override
|
||||
+ public @AnimationType int getAnimationType() {
|
||||
+ return AnimationType.PROPERTY;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setProfile(Profile profile) {
|
||||
+ mProfile = profile;
|
||||
+ }
|
||||
|
||||
Reference in New Issue
Block a user