diff options
| author | shinyak@google.com <shinyak@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 13:34:08 +0000 |
|---|---|---|
| committer | shinyak@google.com <shinyak@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 13:34:08 +0000 |
| commit | dee113502e869e4d927eba89dfbdad9be0d6fc6d (patch) | |
| tree | 21b1d303e049d5b90ffa9aa125b6a21c07a04327 /views | |
| parent | a2d451524eb8568b3e55b599645693b3d819a10c (diff) | |
| download | chromium_src-dee113502e869e4d927eba89dfbdad9be0d6fc6d.zip chromium_src-dee113502e869e4d927eba89dfbdad9be0d6fc6d.tar.gz chromium_src-dee113502e869e4d927eba89dfbdad9be0d6fc6d.tar.bz2 | |
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
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/menu_model_adapter.cc | 5 | ||||
| -rw-r--r-- | views/controls/menu/menu_model_adapter_unittest.cc | 4 | ||||
| -rw-r--r-- | views/view_unittest.cc | 3 |
3 files changed, 4 insertions, 8 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; diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 2442d9e..728f387 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -1035,8 +1035,7 @@ class MockMenuModel : public ui::MenuModel { MOCK_CONST_METHOD1(GetSubmenuModelAt, MenuModel*(int index)); MOCK_METHOD1(HighlightChangedTo, void(int index)); MOCK_METHOD1(ActivatedAt, void(int index)); - MOCK_METHOD2(ActivatedAtWithDisposition, void(int index, - int disposition)); + MOCK_METHOD2(ActivatedAt, void(int index, int disposition)); MOCK_METHOD0(MenuWillShow, void()); MOCK_METHOD0(MenuClosed, void()); MOCK_METHOD1(SetMenuModelDelegate, void(ui::MenuModelDelegate* delegate)); |