Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6712)

Unified Diff: chrome/browser/renderer_context_menu/render_view_context_menu.cc

Issue 378253002: Fix translate namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing android build errors Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/translate/chrome_translate_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index afa3e925f3b946fd59d1b644f99540b91d4822b1..2c1f6f610e78ddea417317db9cba84f1f57f3eec 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -922,7 +922,7 @@ void RenderViewContextMenu::AppendPageItems() {
if (TranslateService::IsTranslatableURL(params_.page_url)) {
std::string locale = g_browser_process->GetApplicationLocale();
- locale = TranslateDownloadManager::GetLanguageCode(locale);
+ locale = translate::TranslateDownloadManager::GetLanguageCode(locale);
base::string16 language =
l10n_util::GetDisplayNameForLocale(locale, locale, true);
menu_model_.AddItem(
@@ -1181,7 +1181,8 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
std::string original_lang =
chrome_translate_client->GetLanguageState().original_language();
std::string target_lang = g_browser_process->GetApplicationLocale();
- target_lang = TranslateDownloadManager::GetLanguageCode(target_lang);
+ target_lang =
+ translate::TranslateDownloadManager::GetLanguageCode(target_lang);
// Note that we intentionally enable the menu even if the original and
// target languages are identical. This is to give a way to user to
// translate a page that might contains text fragments in a different
@@ -1192,7 +1193,8 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const {
!source_web_contents_->GetInterstitialPage() &&
// There are some application locales which can't be used as a
// target language for translation.
- TranslateDownloadManager::IsSupportedLanguage(target_lang) &&
+ translate::TranslateDownloadManager::IsSupportedLanguage(
+ target_lang) &&
// Disable on the Instant Extended NTP.
!chrome::IsInstantNTP(source_web_contents_);
}
@@ -1735,14 +1737,15 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
std::string original_lang =
chrome_translate_client->GetLanguageState().original_language();
std::string target_lang = g_browser_process->GetApplicationLocale();
- target_lang = TranslateDownloadManager::GetLanguageCode(target_lang);
+ target_lang =
+ translate::TranslateDownloadManager::GetLanguageCode(target_lang);
// Since the user decided to translate for that language and site, clears
// any preferences for not translating them.
- scoped_ptr<TranslatePrefs> prefs(
+ scoped_ptr<translate::TranslatePrefs> prefs(
ChromeTranslateClient::CreateTranslatePrefs(profile_->GetPrefs()));
prefs->UnblockLanguage(original_lang);
prefs->RemoveSiteFromBlacklist(params_.page_url.HostNoBrackets());
- TranslateManager* manager =
+ translate::TranslateManager* manager =
chrome_translate_client->GetTranslateManager();
DCHECK(manager);
manager->TranslatePage(original_lang, target_lang, true);
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/translate/chrome_translate_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698