chrome/browser/translate/chrome_translate_client.cc - Issue 1923143003: Implement the 2016Q2 Translate UI designe spec out in

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: fix namespace in .h and other minor review 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

« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/translate/translate_bubble_model.h » ('j') | chrome/browser/ui/translate/translate_bubble_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..0b3b8c3462de67cdee507d95b356cfadfbf8cee4 100644

--- a/chrome/browser/translate/chrome_translate_client.cc

+++ b/chrome/browser/translate/chrome_translate_client.cc

@@ -204,8 +204,10 @@ 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())

- return;

+ if (!base::FeatureList::IsEnabled(translate::kTranslateUI2016Q2)) {

msw 2016/04/29 19:59:59 nit: combine with nested if statement using &&...

ftang 2016/04/29 22:37:00 Done.

+ if (!GetLanguageState().HasLanguageChanged())

+ return;

+ }

if (!triggered_from_menu) {

if (web_contents()->GetBrowserContext()->IsOffTheRecord())