UMA Metrics for the user menu, including vasquette-detection

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 <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
+#include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/speech/tts_controller.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 2331 matching lines @@
                                    const gfx::Rect& rect) {
   gfx::Point origin(rect.origin());
   views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin);
   gfx::Rect bounds(origin, rect.size());
 
   AvatarMenuBubbleView::ShowBubble(
       this, views::BubbleBorder::TOP_RIGHT, views::BubbleBorder::PAINT_NORMAL,
       views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, bounds, browser_.get());
 }
 
-void BrowserView::ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode) {
+void BrowserView::ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,

[sky, 2014/05/23 20:41:42]

nit: wrap mode to the next line so the two parameters are aligned (same as 2435
below).

[Mike Lerman, 2014/05/26 12:55:24]

Done.

+    signin::GAIAServiceType service_type) {
   if (switches::IsNewAvatarMenu()) {
     NewAvatarButton* button = frame_->GetNewAvatarMenuButton();
     if (button) {
       gfx::Point origin;
       views::View::ConvertPointToScreen(button, &origin);
       gfx::Rect bounds(origin, size());
 
       ProfileChooserView::BubbleViewMode view_mode;
       switch (mode) {
         case AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT:
           view_mode = ProfileChooserView::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT;
           break;
         case AVATAR_BUBBLE_MODE_SIGNIN:
           view_mode = ProfileChooserView::BUBBLE_VIEW_MODE_GAIA_SIGNIN;
           break;
         case AVATAR_BUBBLE_MODE_REAUTH:
           view_mode = ProfileChooserView::BUBBLE_VIEW_MODE_GAIA_REAUTH;
           break;
         default:
           view_mode = ProfileChooserView::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
           break;
       }
-
       ProfileChooserView::ShowBubble(
-          view_mode, button, views::BubbleBorder::TOP_RIGHT,
+          view_mode, service_type, button, views::BubbleBorder::TOP_RIGHT,
           views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, bounds, browser());
     }
   } else {
     views::BubbleBorder::Arrow arrow = views::BubbleBorder::TOP_RIGHT;
     views::View* anchor_view = frame_->GetAvatarMenuButton();
     if (!anchor_view)
       anchor_view = toolbar_->app_menu();
     else if (!frame_->GetAvatarMenuButton()->button_on_right())
       arrow = views::BubbleBorder::TOP_LEFT;
     gfx::Point origin;
@@ skipping 132 matching lines @@
       !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
     gfx::Point icon_bottom(
         toolbar_->location_bar()->GetLocationBarAnchorPoint());
     ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }