Chromium Code Reviews| Index: chrome/browser/ui/browser_commands.cc |
| diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc |
| index c612bc7f27494e29f8092bdf71b258ac17763e77..6cd27936774a433546c012a995155d36b61318c8 100644 |
| --- a/chrome/browser/ui/browser_commands.cc |
| +++ b/chrome/browser/ui/browser_commands.cc |
| @@ -51,6 +51,7 @@ |
| #include "chrome/browser/ui/tab_contents/core_tab_helper.h" |
| #include "chrome/browser/ui/tab_dialogs.h" |
| #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| +#include "chrome/browser/ui/translate/translate_bubble_view_state_transition.h" |
| #include "chrome/browser/upgrade_detector.h" |
| #include "chrome/common/content_restriction.h" |
| #include "chrome/common/features.h" |
| @@ -117,9 +118,34 @@ |
| #endif |
| namespace { |
| + |
| const char kOsOverrideForTabletSite[] = "Linux; Android 4.0.3"; |
| + |
| +translate::TranslateBubbleUiEvent TranslateBubbleResultToUiEvent( |
| + ShowTranslateBubbleResult result) { |
|
groby-ooo-7-16
2016/11/15 01:15:43
The same thing applies here - I don't know if the
Roger McFarlane (Chromium)
2016/11/16 05:51:31
Or maybe get rid of ShowTranslateBubbleResult and
|
| + switch (result) { |
| + case ShowTranslateBubbleResult::SUCCESS: |
| + return translate::TranslateBubbleUiEvent::BUBBLE_SHOWN; |
| + case ShowTranslateBubbleResult::BROWSER_WINDOW_NOT_VALID: |
| + return translate::TranslateBubbleUiEvent:: |
| + BUBBLE_NOT_SHOWN_WINDOW_NOT_VALID; |
| + case ShowTranslateBubbleResult::BROWSER_WINDOW_MINIMIZED: |
| + return translate::TranslateBubbleUiEvent:: |
| + BUBBLE_NOT_SHOWN_WINDOW_MINIMIZED; |
| + case ShowTranslateBubbleResult::BROWSER_WINDOW_NOT_ACTIVE: |
| + return translate::TranslateBubbleUiEvent:: |
| + BUBBLE_NOT_SHOWN_WINDOW_NOT_ACTIVE; |
| + case ShowTranslateBubbleResult::WEB_CONTENTS_NOT_ACTIVE: |
| + return translate::TranslateBubbleUiEvent:: |
| + BUBBLE_NOT_SHOWN_WEB_CONTENTS_NOT_ACTIVE; |
| + case ShowTranslateBubbleResult::EDITABLE_FIELD_IS_ACTIVE: |
| + return translate::TranslateBubbleUiEvent:: |
| + BUBBLE_NOT_SHOWN_EDITABLE_FIELD_IS_ACTIVE; |
| + } |
| } |
| +} // namespace |
| + |
| using base::UserMetricsAction; |
| using bookmarks::BookmarkModel; |
| using content::NavigationController; |
| @@ -827,8 +853,10 @@ void Translate(Browser* browser) { |
| else if (chrome_translate_client->GetLanguageState().IsPageTranslated()) |
| step = translate::TRANSLATE_STEP_AFTER_TRANSLATE; |
| } |
| - browser->window()->ShowTranslateBubble( |
| + ShowTranslateBubbleResult result = browser->window()->ShowTranslateBubble( |
| web_contents, step, translate::TranslateErrors::NONE, true); |
| + if (result != ShowTranslateBubbleResult::SUCCESS) |
| + translate::ReportUiAction(TranslateBubbleResultToUiEvent(result)); |
| } |
| void ManagePasswordsForPage(Browser* browser) { |