Replace ButtonDropDown menu implementation (Menu2) with MenuItemView.

chrome/browser/ui/views/button_dropdown_test.cc

Index: chrome/browser/ui/views/button_dropdown_test.cc
diff --git a/chrome/browser/ui/views/button_dropdown_test.cc b/chrome/browser/ui/views/button_dropdown_test.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c91ec1997b219d6365faa42a8b65647ff872b98e
--- /dev/null
+++ b/chrome/browser/ui/views/button_dropdown_test.cc
@@ -0,0 +1,129 @@
+// 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 "base/message_loop.h"
+#include "base/utf_string_conversions.h"
+#include "ui/base/models/simple_menu_model.h"
+#include "chrome/browser/automation/ui_controls.h"
+#include "chrome/test/interactive_ui/view_event_test_base.h"
+#include "views/controls/button/button_dropdown.h"
+
+class ButtonDropDownDragTest : public ViewEventTestBase,
+                               ui::SimpleMenuModel::Delegate {
+ public:
+  ButtonDropDownDragTest() : button_(NULL),

[sky, 2011/05/31 23:10:40]

nit: if you can't fit all the members on the initial line, then wrap the : to
the next line
(http://www.corp.google.com/eng/doc/cppguide.xml#Constructor_Initializer_Lists).

[rhashimoto, 2011/05/31 23:36:49]

Done.

+                             ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)),
+                             menu_shown_(false),
+                             menu_closed_(false) {
+  }
+
+  virtual ~ButtonDropDownDragTest() {
+  }
+
+  // ViewEventTestBase implementation.
+  virtual void SetUp() OVERRIDE {
+    button_ = new views::ButtonDropDown(NULL, &menu_model_);
+
+    ViewEventTestBase::SetUp();
+  }
+
+  virtual void TearDown() OVERRIDE {
+    ViewEventTestBase::TearDown();
+  }
+
+  virtual views::View* CreateContentsView() OVERRIDE {
+    return button_;
+  }
+
+  virtual gfx::Size GetPreferredSize() OVERRIDE {
+    return button_->GetPreferredSize();
+  }
+
+  // ui::SimpleMenuModel::Delegate implementation.
+  virtual bool IsCommandIdChecked(int id) const OVERRIDE {
+    return false;
+  }
+
+  virtual bool IsCommandIdEnabled(int id) const OVERRIDE {
+    return true;
+  }
+
+  virtual bool GetAcceleratorForCommandId(
+      int id,
+      ui::Accelerator* accelerator) OVERRIDE {
+    return false;
+  }
+
+  virtual void ExecuteCommand(int id) OVERRIDE {
+  }
+
+  virtual void MenuWillShow() OVERRIDE {
+    menu_shown_ = true;
+  }
+
+  virtual void MenuClosed() OVERRIDE {
+    menu_closed_ = true;
+  }
+
+  // ViewEventTestBase implementation.
+  virtual void DoTestOnMessageLoop() OVERRIDE {
+    // Click on the ButtonDropDown.
+    ui_controls::MoveMouseToCenterAndPress(
+        button_,
+        ui_controls::LEFT,
+        ui_controls::DOWN,
+        CreateEventTask(this, &ButtonDropDownDragTest::Step1));
+  }
+
+  void Step1() {
+    // Drag to invoke the menu.
+    gfx::Point view_center;
+    views::View::ConvertPointToScreen(button_, &view_center);
+    ui_controls::SendMouseMoveNotifyWhenDone(
+        view_center.x(), view_center.y() + button_->height(),
+        CreateEventTask(this, &ButtonDropDownDragTest::Step2));
+  }
+
+  void Step2() {
+    ASSERT_TRUE(menu_shown_);
+
+    // Release.
+    ui_controls::SendMouseEventsNotifyWhenDone(
+        ui_controls::LEFT,
+        ui_controls::UP,
+        CreateEventTask(this, &ButtonDropDownDragTest::Step3));
+  }
+
+  void Step3() {
+    // Click mouse to dismiss menu.  The views menu does not dismiss the
+    // menu on click-drag-release unless an item is selected.
+    ui_controls::MoveMouseToCenterAndPress(
+        button_,
+        ui_controls::LEFT,
+        ui_controls::DOWN,
+        CreateEventTask(this, &ButtonDropDownDragTest::Step4));
+  }
+
+  void Step4() {
+    // One more hop is required because ui::SimpleMenuModel calls
+    // ui::SimpleMenuModel::Delegate::MenuClosed() via a posted
+    // task.
+    MessageLoopForUI::current()->PostTask(
+        FROM_HERE,
+        CreateEventTask(this, &ButtonDropDownDragTest::Step5));
+  }
+
+  void Step5() {
+    ASSERT_TRUE(menu_closed_);
+    Done();
+  }
+
+ private:
+  views::ButtonDropDown* button_;
+  ui::SimpleMenuModel menu_model_;
+  bool menu_shown_;
+  bool menu_closed_;
+};
+
+VIEW_TEST(ButtonDropDownDragTest, DragActivation)