Replace ChromiumOS BalloonView Menu2 with MenuItemView.

chrome/browser/chromeos/notifications/balloon_view.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/chromeos/notifications/balloon_view.h"
 
 #include <vector>
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 13 matching lines @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/background.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
-#include "views/controls/menu/menu_2.h"
+#include "views/controls/menu/menu_item_view.h"
+#include "views/controls/menu/menu_model_adapter.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/widget/widget.h"
 
 namespace {
 // Menu commands
 const int kNoopCommand = 0;
 const int kRevokePermissionCommand = 1;
 
 // Vertical margin between close button and menu button.
 const int kControlButtonsMargin = 6;
 
 // Top, Right margin for notification control view.
 const int kControlViewTopMargin = 4;
 const int kControlViewRightMargin = 6;
 }  // namespace
 
 namespace chromeos {
 
 // NotificationControlView has close and menu buttons and
 // overlays on top of renderer view.
 class NotificationControlView : public views::View,
                                 public views::ViewMenuDelegate,
                                 public ui::SimpleMenuModel::Delegate,
                                 public views::ButtonListener {
  public:
   explicit NotificationControlView(BalloonViewImpl* view)
       : balloon_view_(view),
         close_button_(NULL),
         options_menu_contents_(NULL),
-        options_menu_menu_(NULL),
         options_menu_button_(NULL) {
     // TODO(oshima): make background transparent.
     set_background(views::Background::CreateSolidBackground(SK_ColorWHITE));
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
     SkBitmap* close_button_n = rb.GetBitmapNamed(IDR_TAB_CLOSE);
     SkBitmap* close_button_m = rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK);
     SkBitmap* close_button_h = rb.GetBitmapNamed(IDR_TAB_CLOSE_H);
     SkBitmap* close_button_p = rb.GetBitmapNamed(IDR_TAB_CLOSE_P);
@@ skipping 35 matching lines @@
 
   virtual gfx::Size GetPreferredSize() {
     gfx::Rect total_bounds =
         close_button_->bounds().Union(options_menu_button_->bounds());
     return total_bounds.size();
   }
 
   // views::ViewMenuDelegate implements.
   virtual void RunMenu(views::View* source, const gfx::Point& pt) {
     CreateOptionsMenu();
-    options_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
+
+    views::MenuModelAdapter menu_model_adapter(options_menu_contents_.get());
+    views::MenuItemView menu(&menu_model_adapter);
+    menu_model_adapter.BuildMenu(&menu);

[oshima, 2011/07/06 18:10:36]

I felt this API a bit wired because you create menu by passing adapter, but then
call adapter.BuildMenu with the menu. I guess this is necessary to migrate from
menu2 to views menu, but I think we can clean this up once migration is
completed. do you have any plan to clean this up?

[rhashimoto, 2011/07/06 18:27:33]

I agree that it is a little strange.  The model serves two purposes - defining
the structure of the menu (items and submenus) and defining the item behavior
(enabled/disabled, font, execution, etc.).  MenuItemView only calls its delegate
to get item behavior and publishes an API to change the structure.  It's
probably better to pull at least the menu structuring directly into
MenuItemView.

I don't have any immediate plans to do this but I can put it on my list. 
pkasting has also requested tweaks to the MenuItemView API.

+
+    gfx::Point screen_location;
+    views::View::ConvertPointToScreen(options_menu_button_,
+                                      &screen_location);
+    gfx::NativeWindow window =
+        source->GetWidget()->GetTopLevelWidget()->GetNativeWindow();
+    menu.RunMenuAt(window,
+                   options_menu_button_,
+                   gfx::Rect(screen_location, options_menu_button_->size()),
+                   views::MenuItemView::TOPRIGHT,
+                   true);
   }
 
   // views::ButtonListener implements.
   virtual void ButtonPressed(views::Button* sender, const views::Event&) {
     balloon_view_->Close(true);
   }
 
   // ui::SimpleMenuModel::Delegate impglements.
   virtual bool IsCommandIdChecked(int /* command_id */) const {
     // Nothing in the menu is checked.
@@ skipping 29 matching lines @@
         balloon_view_->balloon_->notification().display_source());
     const string16 label_text = l10n_util::GetStringFUTF16(
         IDS_NOTIFICATION_BALLOON_REVOKE_MESSAGE,
         balloon_view_->balloon_->notification().display_source());
 
     options_menu_contents_.reset(new ui::SimpleMenuModel(this));
     // TODO(oshima): Showing the source info in the menu for now.
     // Figure out where to show the source info.
     options_menu_contents_->AddItem(kNoopCommand, source_label_text);
     options_menu_contents_->AddItem(kRevokePermissionCommand, label_text);
-
-    options_menu_menu_.reset(new views::Menu2(options_menu_contents_.get()));
   }
 
   BalloonViewImpl* balloon_view_;
 
   views::ImageButton* close_button_;
 
   // The options menu.
   scoped_ptr<ui::SimpleMenuModel> options_menu_contents_;
-  scoped_ptr<views::Menu2> options_menu_menu_;
   views::MenuButton* options_menu_button_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationControlView);
 };
 
 BalloonViewImpl::BalloonViewImpl(bool sticky, bool controls, bool web_ui)
     : balloon_(NULL),
       html_contents_(NULL),
       method_factory_(this),
       stale_(false),
@@ skipping 154 matching lines @@
   service->DenyPermission(balloon_->notification().origin_url());
 }
 
 gfx::NativeView BalloonViewImpl::GetParentNativeView() {
   RenderWidgetHostView* view = html_contents_->render_view_host()->view();
   DCHECK(view);
   return view->GetNativeView();
 }
 
 }  // namespace chromeos