Removed ActivatedAtWithDisposition from menu handler, and introduced ActivatedAt(int id, int event_flags) instead.

After this patch is landed, I will upload cleanup patch.

See also http://codereview.chromium.org/6893046/

BUG=93700
TEST=None


Review URL: http://codereview.chromium.org/7778041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99651 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 6 deletions

diff --git a/views/controls/menu/menu_model_adapter.cc b/views/controls/menu/menu_model_adapter.cc
index 850b6b5..e3d7754 100644
--- a/views/controls/menu/menu_model_adapter.cc
+++ b/views/controls/menu/menu_model_adapter.cc
@@ -67,10 +67,7 @@ void MenuModelAdapter::ExecuteCommand(int id, int mouse_event_flags) {
   ui::MenuModel* model = menu_model_;
   int index = 0;
   if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index)) {
-    const int disposition =
-        ViewsDelegate::views_delegate->GetDispositionForEvent(
-            mouse_event_flags);
-    model->ActivatedAtWithDisposition(index, disposition);
+    model->ActivatedAt(index, mouse_event_flags);
     return;
   }
 
diff --git a/views/controls/menu/menu_model_adapter_unittest.cc b/views/controls/menu/menu_model_adapter_unittest.cc
index f797d40..471b81a 100644
--- a/views/controls/menu/menu_model_adapter_unittest.cc
+++ b/views/controls/menu/menu_model_adapter_unittest.cc
@@ -105,7 +105,7 @@ class MenuModelBase : public ui::MenuModel {
     set_last_activation(index);
   }
 
-  virtual void ActivatedAtWithDisposition(int index, int disposition) OVERRIDE {
+  virtual void ActivatedAt(int index, int event_flags) OVERRIDE {
     ActivatedAt(index);
   }
 
@@ -138,7 +138,7 @@ class MenuModelBase : public ui::MenuModel {
     return items_[index];
   }
 
-  // Access index argument to ActivatedAt() or ActivatedAtWithDisposition().
+  // Access index argument to ActivatedAt().
   int last_activation() const { return last_activation_; }
   void set_last_activation(int last_activation) {
     last_activation_ = last_activation;