diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 02:55:31 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 02:55:31 +0000 |
| commit | 0e62dce4805f9ee8918ed839294fe066d8c0b6ff (patch) | |
| tree | 15be0949d0f4a56a1c0879489602c1db7ee3d247 /ui/message_center | |
| parent | db03f9a0415d4e8cde7b0f8ddbea01455411fedd (diff) | |
| download | chromium_src-0e62dce4805f9ee8918ed839294fe066d8c0b6ff.zip chromium_src-0e62dce4805f9ee8918ed839294fe066d8c0b6ff.tar.gz chromium_src-0e62dce4805f9ee8918ed839294fe066d8c0b6ff.tar.bz2 | |
Makes MenuRunner take a MenuModel directly rather than having to use
MenuModelAdapter.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/13201003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/message_center')
| -rw-r--r-- | ui/message_center/views/message_view.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/message_center/views/message_view.cc b/ui/message_center/views/message_view.cc index 2204f72..e428183 100644 --- a/ui/message_center/views/message_view.cc +++ b/ui/message_center/views/message_view.cc @@ -17,7 +17,6 @@ #include "ui/message_center/message_center_util.h" #include "ui/message_center/notification_change_observer.h" #include "ui/views/controls/button/image_button.h" -#include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/scroll_view.h" #include "ui/views/widget/widget.h" @@ -365,8 +364,7 @@ void MessageView::ShowMenu(gfx::Point screen_location) { if (menu_model.GetItemCount() == 0) return; - views::MenuModelAdapter menu_model_adapter(&menu_model); - views::MenuRunner menu_runner(menu_model_adapter.CreateMenu()); + views::MenuRunner menu_runner(&menu_model); views::View::ConvertPointToScreen(this, &screen_location); ignore_result(menu_runner.RunMenuAt( |