597 lines
30 KiB
Diff
597 lines
30 KiB
Diff
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
|
||
|
||
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||
---
|
||
chrome/browser/BUILD.gn | 2 +-
|
||
.../live_translate_controller_factory.cc | 4 -
|
||
chrome/browser/global_features.h | 2 +
|
||
.../xml/languages_detailed_preferences.xml | 41 -----
|
||
.../java/res/xml/languages_preferences.xml | 4 -
|
||
.../language/settings/LanguageSettings.java | 153 ------------------
|
||
chrome/browser/on_device_translation/BUILD.gn | 2 +-
|
||
.../on_device_speech_recognition_impl.cc | 2 +
|
||
.../on_device_speech_recognition_impl.h | 2 +
|
||
chrome/browser/ui/BUILD.gn | 2 +-
|
||
.../strings/android_chrome_strings.grd | 3 -
|
||
...translation_internals_page_handler_impl.cc | 8 +
|
||
components/live_caption/BUILD.gn | 3 +
|
||
components/live_caption/features.cc | 1 +
|
||
.../buildflags/features.gni | 2 +-
|
||
.../public/mojom/BUILD.gn | 2 +-
|
||
.../core/browser/translate_manager.cc | 5 +-
|
||
.../core/browser/translate_script.cc | 17 +-
|
||
...n_device_speech_recognition_engine_impl.cc | 3 +-
|
||
...on_device_speech_recognition_engine_impl.h | 2 +
|
||
media/base/media_switches.cc | 1 +
|
||
21 files changed, 36 insertions(+), 225 deletions(-)
|
||
|
||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||
--- a/chrome/browser/BUILD.gn
|
||
+++ b/chrome/browser/BUILD.gn
|
||
@@ -6537,7 +6537,7 @@ static_library("browser") {
|
||
"//chrome/browser/updates:update_metrics",
|
||
"//chrome/services/system_signals/public/cpp/browser",
|
||
"//chrome/updater:browser_sources",
|
||
- "//components/on_device_translation",
|
||
+ # "//components/on_device_translation",
|
||
"//components/supervised_user/core/common:features",
|
||
"//components/themes:policy",
|
||
]
|
||
diff --git a/chrome/browser/accessibility/live_translate_controller_factory.cc b/chrome/browser/accessibility/live_translate_controller_factory.cc
|
||
--- a/chrome/browser/accessibility/live_translate_controller_factory.cc
|
||
+++ b/chrome/browser/accessibility/live_translate_controller_factory.cc
|
||
@@ -63,10 +63,6 @@ LiveTranslateControllerFactory::BuildServiceInstanceForBrowserContext(
|
||
// Only set on_device_dispatcher if feature flag is set.
|
||
if (base::FeatureList::IsEnabled(
|
||
live_caption::kLiveCaptionOnDeviceTranslation)) {
|
||
- on_device_dispatcher = std::make_unique<TranslationDispatcherOnDevice>(
|
||
- std::make_unique<
|
||
- on_device_translation::OnDeviceTranslationServiceController>(
|
||
- profile->GetPrefs(), ""));
|
||
}
|
||
google_api_dispatcher = std::make_unique<GoogleApiTranslationDispatcher>(
|
||
google_apis::GetAPIKey(), context);
|
||
diff --git a/chrome/browser/global_features.h b/chrome/browser/global_features.h
|
||
--- a/chrome/browser/global_features.h
|
||
+++ b/chrome/browser/global_features.h
|
||
@@ -261,8 +261,10 @@ class GlobalFeatures {
|
||
#endif // BUILDFLAG(ENABLE_DEVICE_BOUND_SESSIONS)
|
||
|
||
#if !BUILDFLAG(IS_ANDROID)
|
||
+#if false // BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
|
||
std::unique_ptr<on_device_translation::OnDeviceTranslationInstaller>
|
||
on_device_translation_installer_;
|
||
+#endif
|
||
|
||
std::unique_ptr<ProfileLaunchObserver> profile_launch_observer_;
|
||
#endif // !BUILDFLAG(IS_ANDROID)
|
||
diff --git a/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml b/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml
|
||
--- a/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml
|
||
+++ b/chrome/browser/language/android/java/res/xml/languages_detailed_preferences.xml
|
||
@@ -39,45 +39,4 @@ found in the LICENSE file.
|
||
|
||
</PreferenceCategory>
|
||
|
||
- <PreferenceCategory
|
||
- android:key="translation_settings_section"
|
||
- android:order="5"
|
||
- android:title="@string/languages_settings_translation_title"
|
||
- app:allowDividerAbove="true"
|
||
- app:allowDividerBelow="false">
|
||
-
|
||
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
|
||
- android:key="translate_switch"
|
||
- android:title="@string/languages_send_translate_switch"
|
||
- app:allowDividerAbove="false"
|
||
- app:allowDividerBelow="true"/>
|
||
-
|
||
- <PreferenceCategory
|
||
- android:key="translation_advanced_settings_section"
|
||
- android:title="@string/languages_settings_advanced"
|
||
- app:allowDividerAbove="true"
|
||
- app:allowDividerBelow="false">
|
||
-
|
||
- <org.chromium.chrome.browser.language.settings.LanguageItemPickerPreference
|
||
- android:key="translate_settings_target_language"
|
||
- android:title="@string/languages_settings_target"
|
||
- app:allowDividerAbove="false"
|
||
- app:allowDividerBelow="false" />
|
||
-
|
||
- <org.chromium.chrome.browser.language.settings.LanguageItemListPreference
|
||
- android:key="translate_settings_always_languages"
|
||
- android:title="@string/languages_settings_automatic"
|
||
- app:allowDividerAbove="false"
|
||
- app:allowDividerBelow="false" />
|
||
-
|
||
- <org.chromium.chrome.browser.language.settings.LanguageItemListPreference
|
||
- android:key="translate_settings_never_languages"
|
||
- android:title="@string/languages_settings_dont_offer_langs"
|
||
- app:allowDividerAbove="false"
|
||
- app:allowDividerBelow="false" />
|
||
-
|
||
- </PreferenceCategory>
|
||
-
|
||
- </PreferenceCategory>
|
||
-
|
||
</PreferenceScreen>
|
||
diff --git a/chrome/browser/language/android/java/res/xml/languages_preferences.xml b/chrome/browser/language/android/java/res/xml/languages_preferences.xml
|
||
--- a/chrome/browser/language/android/java/res/xml/languages_preferences.xml
|
||
+++ b/chrome/browser/language/android/java/res/xml/languages_preferences.xml
|
||
@@ -18,8 +18,4 @@ found in the LICENSE file.
|
||
android:layout="@layout/languages_preference"
|
||
android:widgetLayout="@layout/accept_languages_list" />
|
||
|
||
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
|
||
- android:key="translate_switch"
|
||
- android:title="@string/languages_offer_translate_switch" />
|
||
-
|
||
</PreferenceScreen>
|
||
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
|
||
--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
|
||
+++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
|
||
@@ -34,7 +34,6 @@ import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
|
||
import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
|
||
import org.chromium.chrome.browser.settings.SettingsNavigationFactory;
|
||
import org.chromium.chrome.browser.settings.search.ChromeBaseSearchIndexProvider;
|
||
-import org.chromium.chrome.browser.translate.TranslateBridge;
|
||
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
|
||
import org.chromium.components.browser_ui.settings.SettingsUtils;
|
||
import org.chromium.components.browser_ui.settings.search.SettingsIndexData;
|
||
@@ -59,12 +58,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment
|
||
static final String APP_LANGUAGE_PREFERENCE_KEY = "app_language_preference";
|
||
static final String PREFERRED_LANGUAGES_KEY = "preferred_languages";
|
||
static final String CONTENT_LANGUAGES_KEY = "content_languages_preference";
|
||
- static final String TRANSLATE_SWITCH_KEY = "translate_switch";
|
||
-
|
||
- static final String TRANSLATION_ADVANCED_SECTION = "translation_advanced_settings_section";
|
||
- static final String TARGET_LANGUAGE_KEY = "translate_settings_target_language";
|
||
- static final String ALWAYS_LANGUAGES_KEY = "translate_settings_always_languages";
|
||
- static final String NEVER_LANGUAGES_KEY = "translate_settings_never_languages";
|
||
|
||
private static final String TAG = "LanguageSettings";
|
||
|
||
@@ -113,35 +106,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment
|
||
ContentLanguagesPreference languageListPref =
|
||
(ContentLanguagesPreference) findPreference(PREFERRED_LANGUAGES_KEY);
|
||
languageListPref.initialize(this, getProfile(), getPrefService());
|
||
-
|
||
- 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);
|
||
- languageListPref.notifyPrefChanged();
|
||
- LanguagesManager.recordAction(
|
||
- enabled
|
||
- ? LanguagesManager.LanguageSettingsActionType
|
||
- .ENABLE_TRANSLATE_GLOBALLY
|
||
- : LanguagesManager.LanguageSettingsActionType
|
||
- .DISABLE_TRANSLATE_GLOBALLY);
|
||
- return true;
|
||
- }
|
||
- });
|
||
- translateSwitch.setManagedPreferenceDelegate(
|
||
- new ChromeManagedPreferenceDelegate(getProfile()) {
|
||
- @Override
|
||
- public boolean isPreferenceControlledByPolicy(Preference preference) {
|
||
- return getPrefService().isManagedPreference(Pref.OFFER_TRANSLATE_ENABLED);
|
||
- }
|
||
- });
|
||
}
|
||
|
||
/**
|
||
@@ -156,8 +120,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment
|
||
ContentLanguagesPreference languageListPref =
|
||
(ContentLanguagesPreference) findPreference(CONTENT_LANGUAGES_KEY);
|
||
languageListPref.initialize(this, getProfile(), getPrefService());
|
||
-
|
||
- setupTranslateSection(languageListPref);
|
||
}
|
||
|
||
/** Setup the App Language section with a title and preference to choose the app language. */
|
||
@@ -181,95 +143,6 @@ public class LanguageSettings extends ChromeBaseSettingsFragment
|
||
mAppLanguageDelegate.setup(this, appLanguagePreference, getProfile());
|
||
}
|
||
|
||
- /**
|
||
- * Setup the translate preferences section. A switch preferences controls if translate is
|
||
- * enabled/disabled and will hide all advanced settings when disabled.
|
||
- *
|
||
- * @param contentLanguagesPreference ContentLanguagesPreference reference to update about state
|
||
- * changes.
|
||
- */
|
||
- private void setupTranslateSection(ContentLanguagesPreference contentLanguagesPreference) {
|
||
- // Setup expandable advanced settings section.
|
||
- PreferenceCategory translationAdvancedSection =
|
||
- (PreferenceCategory) findPreference(TRANSLATION_ADVANCED_SECTION);
|
||
- translationAdvancedSection.setOnExpandButtonClickListener(
|
||
- () -> {
|
||
- // Lambda for PreferenceGroup.OnExpandButtonClickListener.
|
||
- LanguagesManager.recordImpression(
|
||
- LanguagesManager.LanguageSettingsPageType.ADVANCED_LANGUAGE_SETTINGS);
|
||
- });
|
||
- translationAdvancedSection.setVisible(
|
||
- getPrefService().getBoolean(Pref.OFFER_TRANSLATE_ENABLED));
|
||
-
|
||
- // Setup target language preference.
|
||
- LanguageItemPickerPreference targetLanguagePreference =
|
||
- (LanguageItemPickerPreference) findPreference(TARGET_LANGUAGE_KEY);
|
||
- targetLanguagePreference.setLanguageItem(
|
||
- getProfile(), TranslateBridge.getTargetLanguageForChromium(getProfile()));
|
||
- setSelectLanguageLauncher(
|
||
- targetLanguagePreference,
|
||
- LanguagesManager.LanguageListType.TARGET_LANGUAGES,
|
||
- REQUEST_CODE_CHANGE_TARGET_LANGUAGE,
|
||
- LanguagesManager.LanguageSettingsPageType.CHANGE_TARGET_LANGUAGE);
|
||
- mPrefChangeRegistrar.addObserver(
|
||
- Pref.PREF_TRANSLATE_RECENT_TARGET,
|
||
- () -> {
|
||
- targetLanguagePreference.setLanguageItem(
|
||
- getProfile(),
|
||
- TranslateBridge.getTargetLanguageForChromium(getProfile()));
|
||
- });
|
||
-
|
||
- // Setup always translate preference.
|
||
- LanguageItemListPreference alwaysTranslatePreference =
|
||
- (LanguageItemListPreference) findPreference(ALWAYS_LANGUAGES_KEY);
|
||
- alwaysTranslatePreference.setFragmentListDelegate(
|
||
- new AlwaysTranslateListFragment.ListDelegate(getProfile()));
|
||
- mPrefChangeRegistrar.addObserver(
|
||
- Pref.PREF_ALWAYS_TRANSLATE_LIST, alwaysTranslatePreference);
|
||
- setLanguageListPreferenceClickListener(alwaysTranslatePreference);
|
||
-
|
||
- // Setup never translate preference.
|
||
- LanguageItemListPreference neverTranslatePreference =
|
||
- (LanguageItemListPreference) findPreference(NEVER_LANGUAGES_KEY);
|
||
- neverTranslatePreference.setFragmentListDelegate(
|
||
- new NeverTranslateListFragment.ListDelegate(getProfile()));
|
||
- mPrefChangeRegistrar.addObserver(Pref.BLOCKED_LANGUAGES, neverTranslatePreference);
|
||
- setLanguageListPreferenceClickListener(neverTranslatePreference);
|
||
-
|
||
- // Setup translate switch to toggle advanced section on and off.
|
||
- 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);
|
||
- updateTranslateAdvancedSectionIndex(enabled, /* refreshResult= */ true);
|
||
- contentLanguagesPreference.notifyPrefChanged();
|
||
- translationAdvancedSection.setVisible(enabled);
|
||
- notifyPreferencesUpdated();
|
||
- LanguagesManager.recordAction(
|
||
- enabled
|
||
- ? LanguagesManager.LanguageSettingsActionType
|
||
- .ENABLE_TRANSLATE_GLOBALLY
|
||
- : LanguagesManager.LanguageSettingsActionType
|
||
- .DISABLE_TRANSLATE_GLOBALLY);
|
||
- return true;
|
||
- }
|
||
- });
|
||
- translateSwitch.setManagedPreferenceDelegate(
|
||
- new ChromeManagedPreferenceDelegate(getProfile()) {
|
||
- @Override
|
||
- public boolean isPreferenceControlledByPolicy(Preference preference) {
|
||
- return getPrefService().isManagedPreference(Pref.OFFER_TRANSLATE_ENABLED);
|
||
- }
|
||
- });
|
||
- }
|
||
-
|
||
@Override
|
||
public void onStart() {
|
||
super.onStart();
|
||
@@ -324,17 +197,9 @@ public class LanguageSettings extends ChromeBaseSettingsFragment
|
||
// Get the actual default system language to set as target language.
|
||
code = GlobalAppLocaleController.getInstance().getOriginalSystemLocale().getLanguage();
|
||
}
|
||
- // Set the default target language to match the new app language.
|
||
- TranslateBridge.setDefaultTargetLanguage(getProfile(), code);
|
||
}
|
||
|
||
private void onChangeTargetLanguage(String code) {
|
||
- LanguageItemPickerPreference targetLanguagePreference =
|
||
- (LanguageItemPickerPreference) findPreference(TARGET_LANGUAGE_KEY);
|
||
- targetLanguagePreference.setLanguageItem(getProfile(), code);
|
||
- TranslateBridge.setDefaultTargetLanguage(getProfile(), code);
|
||
- LanguagesManager.recordAction(
|
||
- LanguagesManager.LanguageSettingsActionType.CHANGE_TARGET_LANGUAGE);
|
||
}
|
||
|
||
/**
|
||
@@ -482,23 +347,5 @@ public class LanguageSettings extends ChromeBaseSettingsFragment
|
||
|
||
private static void updateTranslateAdvancedSectionIndex(
|
||
boolean enabled, boolean refreshResult) {
|
||
- var indexData = SettingsIndexData.getInstance();
|
||
- if (indexData == null) return;
|
||
-
|
||
- String prefFrag = LanguageSettings.class.getName();
|
||
- if (enabled) {
|
||
- indexData.addEntryForKey(
|
||
- prefFrag, TARGET_LANGUAGE_KEY, R.string.languages_settings_target);
|
||
- indexData.addEntryForKey(
|
||
- prefFrag, ALWAYS_LANGUAGES_KEY, R.string.languages_settings_automatic);
|
||
- indexData.addEntryForKey(
|
||
- prefFrag, NEVER_LANGUAGES_KEY, R.string.languages_settings_dont_offer_langs);
|
||
- indexData.resolveIndex(); // Restores the header of the added entries.
|
||
- } else {
|
||
- indexData.removeEntryForKey(prefFrag, TARGET_LANGUAGE_KEY);
|
||
- indexData.removeEntryForKey(prefFrag, ALWAYS_LANGUAGES_KEY);
|
||
- indexData.removeEntryForKey(prefFrag, NEVER_LANGUAGES_KEY);
|
||
- }
|
||
- if (refreshResult) indexData.setRefreshResult(true);
|
||
}
|
||
}
|
||
diff --git a/chrome/browser/on_device_translation/BUILD.gn b/chrome/browser/on_device_translation/BUILD.gn
|
||
--- a/chrome/browser/on_device_translation/BUILD.gn
|
||
+++ b/chrome/browser/on_device_translation/BUILD.gn
|
||
@@ -12,7 +12,7 @@ source_set("on_device_translation") {
|
||
"../component_updater/translate_kit_component_installer.h",
|
||
"../component_updater/translate_kit_language_pack_component_installer.cc",
|
||
"../component_updater/translate_kit_language_pack_component_installer.h",
|
||
- "installer_impl.cc",
|
||
+ # "installer_impl.cc",
|
||
"installer_impl.h",
|
||
"service_controller_manager_factory.cc",
|
||
"service_controller_manager_factory.h",
|
||
diff --git a/chrome/browser/speech/on_device_speech_recognition_impl.cc b/chrome/browser/speech/on_device_speech_recognition_impl.cc
|
||
--- a/chrome/browser/speech/on_device_speech_recognition_impl.cc
|
||
+++ b/chrome/browser/speech/on_device_speech_recognition_impl.cc
|
||
@@ -175,6 +175,7 @@ void OnDeviceSpeechRecognitionImpl::Install(
|
||
language_installation_callbacks_[language_names_key].push_back(
|
||
std::move(callback));
|
||
|
||
+#if false
|
||
model_broker_client_ =
|
||
optimization_guide_keyed_service->CreateModelBrokerClient();
|
||
|
||
@@ -189,6 +190,7 @@ void OnDeviceSpeechRecognitionImpl::Install(
|
||
.WaitForClient(base::BindOnce(
|
||
&OnDeviceSpeechRecognitionImpl::OnModelClientAvailable,
|
||
weak_ptr_factory_.GetWeakPtr()));
|
||
+#endif
|
||
} else {
|
||
language_installation_callbacks_[language_names_key].push_back(
|
||
std::move(callback));
|
||
diff --git a/chrome/browser/speech/on_device_speech_recognition_impl.h b/chrome/browser/speech/on_device_speech_recognition_impl.h
|
||
--- a/chrome/browser/speech/on_device_speech_recognition_impl.h
|
||
+++ b/chrome/browser/speech/on_device_speech_recognition_impl.h
|
||
@@ -102,7 +102,9 @@ class OnDeviceSpeechRecognitionImpl
|
||
base::flat_map<std::set<std::string>, std::list<InstallCallback>>
|
||
language_installation_callbacks_;
|
||
|
||
+#if false
|
||
std::unique_ptr<optimization_guide::ModelBrokerClient> model_broker_client_;
|
||
+#endif
|
||
#endif // !BUILDFLAG(IS_ANDROID)
|
||
|
||
mojo::Receiver<media::mojom::OnDeviceSpeechRecognition> receiver_{this};
|
||
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
|
||
@@ -3148,7 +3148,7 @@ static_library("ui") {
|
||
"//chrome/updater:browser_sources",
|
||
"//components/capture_mode",
|
||
"//components/country_codes",
|
||
- "//components/on_device_translation",
|
||
+ # "//components/on_device_translation",
|
||
"//components/services/unzip/public/cpp",
|
||
"//services/audio/public/mojom",
|
||
"//services/video_capture/public/mojom",
|
||
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
|
||
@@ -2103,9 +2103,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.">
|
||
Let websites know the languages you speak. They’ll show content in those languages, 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/chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_page_handler_impl.cc b/chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_page_handler_impl.cc
|
||
--- a/chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_page_handler_impl.cc
|
||
+++ b/chrome/browser/ui/webui/on_device_translation_internals/on_device_translation_internals_page_handler_impl.cc
|
||
@@ -26,6 +26,7 @@ OnDeviceTranslationInternalsPageHandlerImpl::
|
||
: receiver_(this, std::move(receiver)), page_(std::move(page)) {
|
||
// Initialize the pref change registrar.
|
||
pref_change_registrar_.Init(g_browser_process->local_state());
|
||
+#if false
|
||
// Start listening to pref changes for language pack keys.
|
||
for (const auto& it : kLanguagePackComponentConfigMap) {
|
||
pref_change_registrar_.Add(
|
||
@@ -39,6 +40,7 @@ OnDeviceTranslationInternalsPageHandlerImpl::
|
||
&OnDeviceTranslationInternalsPageHandlerImpl::OnPrefChanged,
|
||
base::Unretained(this)));
|
||
}
|
||
+#endif
|
||
|
||
SendLanguagePackInfo();
|
||
}
|
||
@@ -51,8 +53,10 @@ void OnDeviceTranslationInternalsPageHandlerImpl::InstallLanguagePackage(
|
||
if (package_index > static_cast<uint32_t>(LanguagePackKey::kMaxValue)) {
|
||
return;
|
||
}
|
||
+#if false
|
||
ComponentManager::GetInstance().RegisterTranslateKitLanguagePackComponent(
|
||
static_cast<LanguagePackKey>(package_index));
|
||
+#endif
|
||
}
|
||
|
||
void OnDeviceTranslationInternalsPageHandlerImpl::UninstallLanguagePackage(
|
||
@@ -60,12 +64,15 @@ void OnDeviceTranslationInternalsPageHandlerImpl::UninstallLanguagePackage(
|
||
if (package_index > static_cast<uint32_t>(LanguagePackKey::kMaxValue)) {
|
||
return;
|
||
}
|
||
+#if false
|
||
ComponentManager::GetInstance().UninstallTranslateKitLanguagePackComponent(
|
||
static_cast<LanguagePackKey>(package_index));
|
||
+#endif
|
||
}
|
||
|
||
void OnDeviceTranslationInternalsPageHandlerImpl::SendLanguagePackInfo() {
|
||
std::vector<LanguagePackInfoPtr> info_list;
|
||
+#if false
|
||
const auto registered_packs = ComponentManager::GetRegisteredLanguagePacks();
|
||
const auto installed_packs = ComponentManager::GetInstalledLanguagePacks();
|
||
|
||
@@ -79,6 +86,7 @@ void OnDeviceTranslationInternalsPageHandlerImpl::SendLanguagePackInfo() {
|
||
: LanguagePackStatus::kInstalling)
|
||
: LanguagePackStatus::kNotInstalled));
|
||
}
|
||
+#endif
|
||
page_->OnLanguagePackStatus(std::move(info_list));
|
||
}
|
||
|
||
diff --git a/components/live_caption/BUILD.gn b/components/live_caption/BUILD.gn
|
||
--- a/components/live_caption/BUILD.gn
|
||
+++ b/components/live_caption/BUILD.gn
|
||
@@ -109,6 +109,9 @@ if (!is_android && !is_ios) {
|
||
"//ui/native_theme",
|
||
]
|
||
|
||
+ public_deps += [
|
||
+ "//components/on_device_translation/public/mojom",
|
||
+ ]
|
||
if (enable_on_device_translation) {
|
||
sources += [
|
||
"translation_dispatcher_on_device.cc",
|
||
diff --git a/components/live_caption/features.cc b/components/live_caption/features.cc
|
||
--- a/components/live_caption/features.cc
|
||
+++ b/components/live_caption/features.cc
|
||
@@ -10,5 +10,6 @@ namespace live_caption {
|
||
// on-device model is ready to be rolled out.
|
||
BASE_FEATURE(kLiveCaptionOnDeviceTranslation,
|
||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||
+SET_CROMITE_FEATURE_DISABLED(kLiveCaptionOnDeviceTranslation);
|
||
|
||
} // namespace live_caption
|
||
diff --git a/components/on_device_translation/buildflags/features.gni b/components/on_device_translation/buildflags/features.gni
|
||
--- a/components/on_device_translation/buildflags/features.gni
|
||
+++ b/components/on_device_translation/buildflags/features.gni
|
||
@@ -5,5 +5,5 @@
|
||
declare_args() {
|
||
# On Device Translation is still not supported on other platforms.
|
||
# TODO(crbug.com/364795294): Support other platforms.
|
||
- enable_on_device_translation = is_mac || is_win || is_linux || is_chromeos
|
||
+ enable_on_device_translation = false
|
||
}
|
||
diff --git a/components/on_device_translation/public/mojom/BUILD.gn b/components/on_device_translation/public/mojom/BUILD.gn
|
||
--- a/components/on_device_translation/public/mojom/BUILD.gn
|
||
+++ b/components/on_device_translation/public/mojom/BUILD.gn
|
||
@@ -5,7 +5,7 @@
|
||
import("//components/on_device_translation/buildflags/features.gni")
|
||
import("//mojo/public/tools/bindings/mojom.gni")
|
||
|
||
-assert(enable_on_device_translation)
|
||
+# assert(enable_on_device_translation)
|
||
|
||
mojom("mojom") {
|
||
sources = [
|
||
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
|
||
@@ -859,8 +859,9 @@ void TranslateManager::FilterIsTranslatePossible(
|
||
TriggerDecision::kDisabledOffline);
|
||
}
|
||
|
||
- 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 kOfferTranslateEnabled on, though, because that
|
||
// settings syncs and we don't want to turn off translate everywhere else.
|
||
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
|
||
@@ -137,20 +137,13 @@ 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::StringAppendF(&data_, "var serverParams = '';\n");
|
||
+ base::StringAppendF(
|
||
+ &data_, "var gtTimeInfo = {'fetchStart': %0.f, 'fetchEnd': %0.f};\n",
|
||
+ script_fetch_start_time_,
|
||
base::Time::Now().InMillisecondsFSinceUnixEpoch());
|
||
- base::StringAppendF(&data_, "var serverParams = '%s';\n",
|
||
- server_params.c_str());
|
||
|
||
- GURL security_origin = translate::GetTranslateSecurityOrigin();
|
||
- base::StringAppendF(&data_, "var securityOrigin = '%s';\n",
|
||
- security_origin.spec().c_str());
|
||
+ base::StringAppendF(&data_, "var securityOrigin = '';\n");
|
||
|
||
// Load embedded translate.js.
|
||
data_.append(ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
|
||
diff --git a/content/browser/speech/on_device_speech_recognition_engine_impl.cc b/content/browser/speech/on_device_speech_recognition_engine_impl.cc
|
||
--- a/content/browser/speech/on_device_speech_recognition_engine_impl.cc
|
||
+++ b/content/browser/speech/on_device_speech_recognition_engine_impl.cc
|
||
@@ -136,7 +136,7 @@ void OnDeviceSpeechRecognitionEngine::CreateModelClientOnUI(
|
||
if (!rfh) {
|
||
return;
|
||
}
|
||
-
|
||
+#if false
|
||
core_->model_broker_client =
|
||
GetContentClient()->browser()->CreateModelBrokerClient(
|
||
rfh->GetBrowserContext());
|
||
@@ -151,6 +151,7 @@ void OnDeviceSpeechRecognitionEngine::CreateModelClientOnUI(
|
||
&OnDeviceSpeechRecognitionEngine::OnModelClientAvailable,
|
||
weak_factory_.GetWeakPtr()));
|
||
}
|
||
+#endif
|
||
}
|
||
|
||
void OnDeviceSpeechRecognitionEngine::OnModelClientAvailable(
|
||
diff --git a/content/browser/speech/on_device_speech_recognition_engine_impl.h b/content/browser/speech/on_device_speech_recognition_engine_impl.h
|
||
--- a/content/browser/speech/on_device_speech_recognition_engine_impl.h
|
||
+++ b/content/browser/speech/on_device_speech_recognition_engine_impl.h
|
||
@@ -67,7 +67,9 @@ class CONTENT_EXPORT OnDeviceSpeechRecognitionEngine
|
||
|
||
mojo::Remote<on_device_model::mojom::Session> session;
|
||
base::WeakPtr<optimization_guide::ModelClient> model_client;
|
||
+#if false
|
||
std::unique_ptr<optimization_guide::ModelBrokerClient> model_broker_client;
|
||
+#endif
|
||
};
|
||
|
||
private:
|
||
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
|
||
@@ -1823,6 +1823,7 @@ bool IsHardwareSecureDecryptionEnabled() {
|
||
}
|
||
|
||
bool IsLiveTranslateEnabled() {
|
||
+ if ((true)) return false;
|
||
#if BUILDFLAG(IS_CHROMEOS)
|
||
return base::FeatureList::IsEnabled(kFeatureManagementLiveTranslateCrOS);
|
||
#else
|
||
--
|