Revert 96306 - Multi-Profiles: Change avatar menu to bubble view

chrome/browser/ui/views/avatar_menu_button.cc

 // Copyright (c) 2011 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/avatar_menu_button.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/profile_menu_model.h"
-#include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
-#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/avatar_menu.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/widget/widget.h"
 
 static inline int Round(double x) {
   return static_cast<int>(x + 0.5);
 }
 
 AvatarMenuButton::AvatarMenuButton(Browser* browser, bool has_menu)
     : MenuButton(NULL, std::wstring(), this, false),
       browser_(browser),
@@ skipping 35 matching lines @@
   if (!has_menu_)
     return false;
   return views::MenuButton::HitTest(point);
 }
 
 // views::ViewMenuDelegate implementation
 void AvatarMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
   if (!has_menu_)
     return;
 
-  BrowserView* browser_view = BrowserView::GetBrowserViewForNativeWindow(
-      browser_->window()->GetNativeHandle());
-
-  gfx::Point origin;
-  views::View::ConvertPointToScreen(this, &origin);
-  gfx::Rect bounds(0, 0, width(), height());
-  bounds.set_origin(origin);
-
-  AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_);
-  // Bubble::Show() takes ownership of the view.
-  Bubble::Show(browser_view->GetWidget(), bounds, BubbleBorder::TOP_LEFT,
-               bubble_view, bubble_view);
+  menu_model_.reset(new ProfileMenuModel(browser_));
+  // The avatar menu will automatically delete itself when done.
+  AvatarMenu* avatar_menu =
+      new AvatarMenu(menu_model_.get(), browser_->profile());
+  avatar_menu->RunMenu(this);
 }