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

Unified Diff: chrome/browser/translate/chrome_translate_client.cc

Issue 1923143003: Implement the 2016Q2 Translate UI designe spec out in (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor changes in comments Created 4 years, 8 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/app/generated_resources.grd ('k') | chrome/browser/ui/translate/translate_bubble_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/translate/chrome_translate_client.cc
diff --git a/chrome/browser/translate/chrome_translate_client.cc b/chrome/browser/translate/chrome_translate_client.cc
index ce32fe0cfdbbcd393e6b4de9c39e5ac61e8e10e4..c0fb526966ce33330d32d894537ee517151b8373 100644
--- a/chrome/browser/translate/chrome_translate_client.cc
+++ b/chrome/browser/translate/chrome_translate_client.cc
@@ -190,12 +190,8 @@ void ChromeTranslateClient::ShowTranslateUI(
step != translate::TRANSLATE_STEP_BEFORE_TRANSLATE,
translate_manager_->GetWeakPtr(),
InfoBarService::FromWebContents(web_contents()),
- web_contents()->GetBrowserContext()->IsOffTheRecord(),
- step,
- source_language,
- target_language,
- error_type,
- triggered_from_menu);
+ web_contents()->GetBrowserContext()->IsOffTheRecord(), step,
+ source_language, target_language, error_type, triggered_from_menu);
return;
}
#endif
@@ -204,8 +200,12 @@ void ChromeTranslateClient::ShowTranslateUI(
if (step == translate::TRANSLATE_STEP_BEFORE_TRANSLATE) {
// TODO(droger): Move this logic out of UI code.
GetLanguageState().SetTranslateEnabled(true);
- if (!GetLanguageState().HasLanguageChanged())
+ // In the new UI, continue offering translation after the user navigates to
+ // another page.
+ if (!base::FeatureList::IsEnabled(translate::kTranslateUI2016Q2) &&
+ !GetLanguageState().HasLanguageChanged()) {
return;
+ }
if (!triggered_from_menu) {
if (web_contents()->GetBrowserContext()->IsOffTheRecord())
@@ -268,8 +268,8 @@ void ChromeTranslateClient::ShowReportLanguageDetectionErrorUI(
return;
}
- chrome::AddSelectedTabWithURL(
- browser, report_url, ui::PAGE_TRANSITION_AUTO_BOOKMARK);
+ chrome::AddSelectedTabWithURL(browser, report_url,
+ ui::PAGE_TRANSITION_AUTO_BOOKMARK);
#endif // defined(OS_ANDROID)
}
@@ -341,8 +341,8 @@ void ChromeTranslateClient::ShowBubble(
return;
}
- TranslateBubbleFactory::Show(
- browser->window(), web_contents(), step, error_type);
+ TranslateBubbleFactory::Show(browser->window(), web_contents(), step,
+ error_type);
#else
NOTREACHED();
#endif
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/translate/translate_bubble_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698