Support full-screen and single-profile avatar bubbles.

chrome/browser/ui/views/profiles/avatar_menu_button.cc

 // 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.
 
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 #include "chrome/common/pref_names.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/widget/widget.h"
 
 static inline int Round(double x) {
@@ skipping 45 matching lines @@
   // Round rather than truncating, so that for odd heights we select an extra
   // pixel below the image center rather than above.  This is because the
   // incognito image has shadows at the top that make the apparent center below
   // the real center.
   int dst_y = Round((height() - dst_height) / 2.0);
   canvas->DrawImageInt(button_icon_, 0, 0, button_icon_.width(),
       button_icon_.height(), dst_x, dst_y, dst_width, dst_height, false);
 }
 
 bool AvatarMenuButton::HitTestRect(const gfx::Rect& rect) const {
-  if (disabled_)
-    return false;
-  return views::MenuButton::HitTestRect(rect);
+  return !disabled_ && views::MenuButton::HitTestRect(rect);
 }
 
 void AvatarMenuButton::SetAvatarIcon(const gfx::Image& icon,
                                      bool is_rectangle) {
   icon_.reset(new gfx::Image(icon));
   button_icon_ = gfx::ImageSkia();
   is_rectangle_ = is_rectangle;
   SchedulePaint();
 }
 
 // views::MenuButtonListener implementation
 void AvatarMenuButton::OnMenuButtonClicked(views::View* source,
                                            const gfx::Point& point) {
-  if (disabled_)
-    return;
-
-  ShowAvatarBubble();
+  if (!disabled_)
+    chrome::ShowAvatarMenu(browser_);
 }
-
-void AvatarMenuButton::ShowAvatarBubble() {
-  gfx::Point origin;
-  views::View::ConvertPointToScreen(this, &origin);
-  gfx::Rect bounds(origin, size());
-  views::BubbleBorder::Arrow arrow = button_on_right_ ?
-      views::BubbleBorder::TOP_RIGHT : views::BubbleBorder::TOP_LEFT;
-  if (switches::IsNewAvatarMenu()) {
-    ProfileChooserView::ShowBubble(
-        ProfileChooserView::BUBBLE_VIEW_MODE_PROFILE_CHOOSER,
-        this, arrow, views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR, bounds,
-        browser_);
-  } else {
-    AvatarMenuBubbleView::ShowBubble(
-        this, arrow, views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR, bounds,
-        browser_);
-  }
-
-  ProfileMetrics::LogProfileOpenMethod(ProfileMetrics::ICON_AVATAR_BUBBLE);
-}