Begin to upgrade BackForwardMenuModelViews to use new menu API....

views/controls/button/button_dropdown.cc

 // Copyright (c) 2006-2008 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 "views/controls/button/button_dropdown.h"
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 // How long to wait before showing the menu
 static const int kMenuTimerDelay = 500;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ButtonDropDown - constructors, destructors, initialization, cleanup
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 ButtonDropDown::ButtonDropDown(ButtonListener* listener,
-                               Menu::Delegate* menu_delegate)
+                               Menu2Model* model)
     : ImageButton(listener),
-      menu_delegate_(menu_delegate),
+      model_(model),
       y_position_on_lbuttondown_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(show_menu_factory_(this)) {
 }
 
 ButtonDropDown::~ButtonDropDown() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ButtonDropDown - Events
@@ skipping 66 matching lines @@
   // NOTE: SetState() schedules a paint, but it won't occur until after the
   //       context menu message loop has terminated, so we PaintNow() to
   //       update the appearance synchronously.
   SetState(BS_PUSHED);
   PaintNow();
   ShowDropDownMenu(GetWidget()->GetNativeView());
   SetState(BS_HOT);
 }
 
 void ButtonDropDown::ShowDropDownMenu(gfx::NativeView window) {
-  if (menu_delegate_) {
+  if (model_) {
     gfx::Rect lb = GetLocalBounds(true);
 
     // Both the menu position and the menu anchor type change if the UI layout
     // is right-to-left.
     gfx::Point menu_position(lb.origin());
     menu_position.Offset(0, lb.height() - 1);
     if (UILayoutIsRightToLeft())
       menu_position.Offset(lb.width() - 1, 0);
 
-    Menu::AnchorPoint anchor = Menu::TOPLEFT;
-    if (UILayoutIsRightToLeft())
-      anchor = Menu::TOPRIGHT;
-
     View::ConvertPointToScreen(this, &menu_position);
 
 #if defined(OS_WIN)
     int left_bound = GetSystemMetrics(SM_XVIRTUALSCREEN);
 #else
     int left_bound = 0;
     NOTIMPLEMENTED();
 #endif
     if (menu_position.x() < left_bound)
       menu_position.set_x(left_bound);
 
-    scoped_ptr<Menu> menu(Menu::Create(menu_delegate_, anchor, window));
-
-    // ID's for AppendMenu is 1-based because RunMenu will ignore the user
-    // selection if id=0 is selected (0 = NO-OP) so we add 1 here and subtract 1
-    // in the handlers above to get the actual index
-    int item_count = menu_delegate_->GetItemCount();
-    for (int i = 0; i < item_count; i++) {
-      if (menu_delegate_->IsItemSeparator(i + 1)) {
-        menu->AppendSeparator();
-      } else {
-        if (menu_delegate_->HasIcon(i + 1))
-          menu->AppendMenuItemWithIcon(i + 1, L"", SkBitmap());
-        else
-          menu->AppendMenuItem(i+1, L"", Menu::NORMAL);
-      }
-    }
-
-    menu->RunMenuAt(menu_position.x(), menu_position.y());
+    menu_.reset(new Menu2(model_));
+    Menu2::Alignment align = Menu2::ALIGN_TOPLEFT;
+    if (UILayoutIsRightToLeft())
+      align = Menu2::ALIGN_TOPLEFT;
+    menu_->RunMenuAt(menu_position, align);
 
     // Need to explicitly clear mouse handler so that events get sent
     // properly after the menu finishes running. If we don't do this, then
     // the first click to other parts of the UI is eaten.
     SetMouseHandler(NULL);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 16 matching lines @@
 }
 
 bool ButtonDropDown::GetAccessibleState(AccessibilityTypes::State* state) {
   DCHECK(state);
 
   *state = AccessibilityTypes::STATE_HASPOPUP;
   return true;
 }
 
 }  // namespace views