[Translate] Integrate TranslateEventProto UMA logging into TranslateManager.

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 91 matching lines @@
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "chrome/grit/theme_resources.h"
 #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"
 #include "components/prefs/pref_service.h"
 #include "components/sessions/core/tab_restore_service.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/translate/core/browser/language_state.h"
+#include "components/translate/core/browser/translate_manager.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/accelerators/accelerator.h"
@@ skipping 1121 matching lines @@
     bool is_user_gesture) {
   return toolbar_->ShowSaveCreditCardBubble(web_contents, controller,
                                             is_user_gesture);
 }
 
 void BrowserView::ShowTranslateBubble(
     content::WebContents* web_contents,
     translate::TranslateStep step,
     translate::TranslateErrors::Type error_type,
     bool is_user_gesture) {
+  ChromeTranslateClient* translate_client =
+      ChromeTranslateClient::FromWebContents(web_contents);
+  translate::TranslateManager* translate_manager =
+      translate_client->GetTranslateManager();

[groby-ooo-7-16, 2016/10/25 18:53:11]

Just DCHECK

[Roger McFarlane (Chromium), 2016/10/25 20:07:56]

Acknowledged.

+
   if (contents_web_view_->HasFocus() &&
       !GetLocationBarView()->IsMouseHovered()) {
     content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
-    if (rvh->IsFocusedElementEditable())
+    if (rvh->IsFocusedElementEditable()) {
+      if (translate_manager &&
+          step == translate::TRANSLATE_STEP_BEFORE_TRANSLATE) {
+        translate_manager->RecordTranslateEvent(
+            metrics::TranslateEventProto::EDITABLE_FIELD_IN_FOCUS);
+      }
       return;
+    }
   }
 
   translate::LanguageState& language_state =
-      ChromeTranslateClient::FromWebContents(web_contents)->GetLanguageState();
+      translate_client->GetLanguageState();
   language_state.SetTranslateEnabled(true);
 
-  if (!IsMinimized()) {
-    toolbar_->ShowTranslateBubble(web_contents, step, error_type,
-                                  is_user_gesture);
+  if (IsMinimized()) {
+    if (translate_manager &&
+        step == translate::TRANSLATE_STEP_BEFORE_TRANSLATE) {
+      translate_manager->RecordTranslateEvent(
+          metrics::TranslateEventProto::BROWSER_WINDOW_MINIMIZED);
+    }
+    return;
   }
+
+  toolbar_->ShowTranslateBubble(web_contents, step, error_type,
+                                is_user_gesture);
 }
 
 #if BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN)
 void BrowserView::ShowOneClickSigninConfirmation(
     const base::string16& email,
     const StartSyncCallback& start_sync_callback) {
   std::unique_ptr<OneClickSigninLinksDelegate> delegate(
       new OneClickSigninLinksDelegateImpl(browser()));
   OneClickSigninDialogView::ShowDialog(email, std::move(delegate),
                                        GetNativeWindow(), start_sync_callback);
@@ skipping 1351 matching lines @@
 }
 
 extensions::ActiveTabPermissionGranter*
 BrowserView::GetActiveTabPermissionGranter() {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return nullptr;
   return extensions::TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter();
 }