Chromium Code Reviews| 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..75c29e73ee4dd7be78d71385d7a52303ae6f4a13 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,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()) |
| + if (!base::FeatureList::IsEnabled(translate::kTranslateUI2016Q2) && |
|
msw
2016/05/03 22:33:34
Why does this only bail for the old UI? Maybe add
ftang
2016/05/03 23:55:41
The problem is currently it stop offer translate i
msw
2016/05/04 00:19:20
I don't understand why this is okay for the new UI
|
| + !GetLanguageState().HasLanguageChanged()) { |
| return; |
| + } |
| if (!triggered_from_menu) { |
| if (web_contents()->GetBrowserContext()->IsOffTheRecord()) |
| @@ -268,8 +266,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 +339,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 |