Desktop Menu UMA for Mac

chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm

 // Copyright 2014 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.
 
 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
+#include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ skipping 68 matching lines @@
               object:[menuController_ window]];
   [super dealloc];
 }
 
 - (NSButton*)buttonView {
   CHECK(button_.get());  // Subclasses must set this.
   return button_.get();
 }
 
 - (void)showAvatarBubble:(NSView*)anchor
-                withMode:(BrowserWindow::AvatarBubbleMode)mode {
+                withMode:(BrowserWindow::AvatarBubbleMode)mode
+         withServiceType:(signin::GAIAServiceType)serviceType {
   if (menuController_)
     return;
 
   DCHECK(chrome::IsCommandEnabled(browser_, IDC_SHOW_AVATAR_MENU));
 
   NSWindowController* wc =
       [browser_->window()->GetNativeWindow() windowController];
   if ([wc isKindOfClass:[BrowserWindowController class]]) {
     [static_cast<BrowserWindowController*>(wc)
         lockBarVisibilityForOwner:self withAnimation:NO delay:NO];
@@ skipping 10 matching lines @@
 
   // |menuController_| will automatically release itself on close.
   if (switches::IsNewAvatarMenu()) {
     profiles::BubbleViewMode viewMode =
         mode == BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT ?
         profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER :
         profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT;
     menuController_ =
         [[ProfileChooserController alloc] initWithBrowser:browser_
                                                anchoredAt:point
-                                                 withMode:viewMode];
+                                                 withMode:viewMode
+                                          withServiceType:serviceType];
   } else {
     menuController_ =
       [[AvatarMenuBubbleController alloc] initWithBrowser:browser_
                                                anchoredAt:point];
   }
 
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(bubbleWillClose:)
              name:NSWindowWillCloseNotification
            object:[menuController_ window]];
   [menuController_ showWindow:self];
 
   ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
 }
 
 - (IBAction)buttonClicked:(id)sender {
   DCHECK_EQ(sender, button_.get());
   [self showAvatarBubble:button_
-                withMode:BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT];
+                withMode:BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT
+         withServiceType:signin::GAIA_SERVICE_TYPE_NONE];
 }
 
 - (void)bubbleWillClose:(NSNotification*)notif {
   NSWindowController* wc =
       [browser_->window()->GetNativeWindow() windowController];
   if ([wc isKindOfClass:[BrowserWindowController class]]) {
     [static_cast<BrowserWindowController*>(wc)
         releaseBarVisibilityForOwner:self withAnimation:YES delay:NO];
   }
   menuController_ = nil;
 }
 
 - (void)updateAvatarButtonAndLayoutParent:(BOOL)layoutParent {
   NOTREACHED();
 }
 
 - (BaseBubbleController*)menuController {
   return menuController_;
 }
 
 @end