0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
bromite/build/patches/ungoogled-chromium-Disable-translate-integration.patch
csagan5 47c948a929 Release 88.0.4324.95
2021-01-26 01:12:38 +01:00

167 lines
9.4 KiB
Diff
Raw Permalink Blame History

From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Mon, 12 Feb 2018 21:28:53 +0100
Subject: ungoogled-chromium: Disable translate integration
Remove translate offer
---
.../xml/languages_detailed_preferences.xml | 5 ---
.../java/res/xml/languages_preferences.xml | 5 ---
.../language/settings/LanguageSettings.java | 43 -------------------
.../strings/android_chrome_strings.grd | 3 --
.../core/browser/translate_manager.cc | 5 ++-
.../core/browser/translate_script.cc | 19 +++-----
6 files changed, 9 insertions(+), 71 deletions(-)
diff --git a/chrome/android/java/res/xml/languages_detailed_preferences.xml b/chrome/android/java/res/xml/languages_detailed_preferences.xml
--- a/chrome/android/java/res/xml/languages_detailed_preferences.xml
+++ b/chrome/android/java/res/xml/languages_detailed_preferences.xml
@@ -11,9 +11,4 @@
android:layout="@layout/languages_preference"
android:widgetLayout="@layout/accept_languages_list" />
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
- android:key="translate_switch"
- android:summaryOn="@string/languages_offer_translate_switch"
- android:summaryOff="@string/languages_offer_translate_switch" />
-
</PreferenceScreen>
diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/android/java/res/xml/languages_preferences.xml
--- a/chrome/android/java/res/xml/languages_preferences.xml
+++ b/chrome/android/java/res/xml/languages_preferences.xml
@@ -11,9 +11,4 @@
android:layout="@layout/languages_preference"
android:widgetLayout="@layout/accept_languages_list" />
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
- android:key="translate_switch"
- android:summaryOn="@string/languages_offer_translate_switch"
- android:summaryOff="@string/languages_offer_translate_switch" />
-
</PreferenceScreen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
@@ -34,7 +34,6 @@ public class LanguageSettings
// The keys for each preference shown on the languages page.
static final String PREFERRED_LANGUAGES_KEY = "preferred_languages";
- static final String TRANSLATE_SWITCH_KEY = "translate_switch";
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -57,27 +56,6 @@ public class LanguageSettings
(DetailedLanguageListPreference) findPreference(PREFERRED_LANGUAGES_KEY);
mLanguageListPref.registerActivityLauncher(this);
-
- ChromeSwitchPreference translateSwitch =
- (ChromeSwitchPreference) findPreference(TRANSLATE_SWITCH_KEY);
- boolean isTranslateEnabled = getPrefService().getBoolean(Pref.OFFER_TRANSLATE_ENABLED);
- translateSwitch.setChecked(isTranslateEnabled);
-
- translateSwitch.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- boolean enabled = (boolean) newValue;
- getPrefService().setBoolean(Pref.OFFER_TRANSLATE_ENABLED, enabled);
- mLanguageListPref.notifyPrefChanged();
- LanguagesManager.recordAction(enabled ? LanguagesManager.LanguageSettingsActionType
- .ENABLE_TRANSLATE_GLOBALLY
- : LanguagesManager.LanguageSettingsActionType
- .DISABLE_TRANSLATE_GLOBALLY);
- return true;
- }
- });
- translateSwitch.setManagedPreferenceDelegate((ChromeManagedPreferenceDelegate) preference
- -> getPrefService().isManagedPreference(Pref.OFFER_TRANSLATE_ENABLED));
}
public void createBasicPreferences(Bundle savedInstanceState, String rootKey) {
@@ -87,27 +65,6 @@ public class LanguageSettings
(LanguageListPreference) findPreference(PREFERRED_LANGUAGES_KEY);
mLanguageListPref.registerActivityLauncher(this);
-
- ChromeSwitchPreference translateSwitch =
- (ChromeSwitchPreference) findPreference(TRANSLATE_SWITCH_KEY);
- boolean isTranslateEnabled = getPrefService().getBoolean(Pref.OFFER_TRANSLATE_ENABLED);
- translateSwitch.setChecked(isTranslateEnabled);
-
- translateSwitch.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- boolean enabled = (boolean) newValue;
- getPrefService().setBoolean(Pref.OFFER_TRANSLATE_ENABLED, enabled);
- mLanguageListPref.notifyPrefChanged();
- LanguagesManager.recordAction(enabled ? LanguagesManager.LanguageSettingsActionType
- .ENABLE_TRANSLATE_GLOBALLY
- : LanguagesManager.LanguageSettingsActionType
- .DISABLE_TRANSLATE_GLOBALLY);
- return true;
- }
- });
- translateSwitch.setManagedPreferenceDelegate((ChromeManagedPreferenceDelegate) preference
- -> getPrefService().isManagedPreference(Pref.OFFER_TRANSLATE_ENABLED));
}
@Override
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1172,9 +1172,6 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_LANGUAGES_LIST_DESCRIPTION" desc="Description on the Languages settings screen. Appears above a list of one or more languages that the user selects, to tell Chrome which languages they prefer to use to read website content.">
Websites will show text in your preferred language, when possible.
</message>
- <message name="IDS_LANGUAGES_OFFER_TRANSLATE_SWITCH" desc="Appears next to the 'offer to translate' switch that controls whether or not Chrome will display the Google Translate UI on web pages that are not in the user's preferred language(s).">
- Offer to translate pages in other languages
- </message>
<message name="IDS_LANGUAGES_SEND_TRANSLATE_SWITCH" desc="Appears next to the switch controlling whether or not Chrome will offer to translate pages in other languages. When enabled the Google Translate UI will be displayed on web pages that are not in the user's preferred language(s).">
Offer to send pages in other languages to Google Translate
</message>
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
@@ -850,8 +850,9 @@ void TranslateManager::FilterIsTranslatePossible(
->LogAutofillAssistantDeferredTriggerDecision();
}
- if (!ignore_missing_key_for_testing_ &&
- !::google_apis::HasAPIKeyConfigured()) {
+// if (!ignore_missing_key_for_testing_ &&
+// !::google_apis::HasAPIKeyConfigured()) {
+ if (true) {
// Without an API key, translate won't work, so don't offer to translate in
// the first place. Leave prefs::kOfferTranslateEnabled on, though, because
// that settings syncs and we don't want to turn off translate everywhere
diff --git a/components/translate/core/browser/translate_script.cc b/components/translate/core/browser/translate_script.cc
--- a/components/translate/core/browser/translate_script.cc
+++ b/components/translate/core/browser/translate_script.cc
@@ -126,19 +126,12 @@ void TranslateScript::OnScriptFetchComplete(bool success,
data_ = base::StringPrintf("var translateApiKey = '%s';\n",
google_apis::GetAPIKey().c_str());
- // Insert server params to pass experimental params to google translate
- // server.
- std::string server_params;
- std::map<std::string, std::string> params;
- base::StringAppendF(
- &data_, "var gtTimeInfo = {'fetchStart': %0.f, 'fetchEnd': %0.f};\n",
- script_fetch_start_time_, base::Time::Now().ToJsTime());
- base::StringAppendF(&data_, "var serverParams = '%s';\n",
- server_params.c_str());
-
- GURL security_origin = translate::GetTranslateSecurityOrigin();
- base::StringAppendF(&data_, "var securityOrigin = '%s';",
- security_origin.spec().c_str());
+ base::StringAppendF(&data_, "var serverParams = '';\n");
+ base::StringAppendF(
+ &data_, "var gtTimeInfo = {'fetchStart': %0.f, 'fetchEnd': %0.f};\n",
+ script_fetch_start_time_, base::Time::Now().ToJsTime());
+
+ base::StringAppendF(&data_, "var securityOrigin = '';");
// Load embedded translate.js.
data_.append(ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
--
2.17.1
Reference in a new issue View git blame Copy permalink