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

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 2400503002: [Translate] Integrate TranslateEventProto UMA logging into TranslateManager. (Closed)
Patch Set: moar ShowTranslateBubbleResult plumbing Created 4 years, 1 month 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
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 59b92742aad928962c2304761d59d0be57917df2..967ac035a9584d3d2e67efa60504c1d688d3981f 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -109,6 +109,7 @@
#include "components/app_modal/app_modal_dialog.h"
#include "components/app_modal/app_modal_dialog_queue.h"
#include "components/app_modal/native_app_modal_dialog.h"
+#include "components/metrics/proto/translate_event.pb.h"
#include "components/omnibox/browser/omnibox_popup_model.h"
#include "components/omnibox/browser/omnibox_popup_view.h"
#include "components/omnibox/browser/omnibox_view.h"
@@ -1206,7 +1207,7 @@ autofill::SaveCardBubbleView* BrowserView::ShowSaveCreditCardBubble(
is_user_gesture);
}
-void BrowserView::ShowTranslateBubble(
+ShowTranslateBubbleResult BrowserView::ShowTranslateBubble(
content::WebContents* web_contents,
translate::TranslateStep step,
translate::TranslateErrors::Type error_type,
@@ -1215,17 +1216,19 @@ void BrowserView::ShowTranslateBubble(
!GetLocationBarView()->IsMouseHovered()) {
content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
if (rvh->IsFocusedElementEditable())
- return;
+ return ShowTranslateBubbleResult::EDITABLE_FIELD_IS_ACTIVE;
}
translate::LanguageState& language_state =
ChromeTranslateClient::FromWebContents(web_contents)->GetLanguageState();
language_state.SetTranslateEnabled(true);
- if (!IsMinimized()) {
- toolbar_->ShowTranslateBubble(web_contents, step, error_type,
- is_user_gesture);
- }
+ if (IsMinimized())
+ return ShowTranslateBubbleResult::BROWSER_WINDOW_MINIMIZED;
+
+ toolbar_->ShowTranslateBubble(web_contents, step, error_type,
+ is_user_gesture);
+ return ShowTranslateBubbleResult::SUCCESS;
}
#if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN)

Powered by Google App Engine
This is Rietveld 408576698