diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 21:06:57 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 21:06:57 +0000 |
| commit | 6277eaded1883e224015efcc5456e3c265e8b633 (patch) | |
| tree | 2c36feca37d7a6132fa14556fb146307285c007d /chrome/browser/task_manager_win.cc | |
| parent | aa1dddf057a4295ee1c09c0566eb98ecd8de8fb8 (diff) | |
| download | chromium_src-6277eaded1883e224015efcc5456e3c265e8b633.zip chromium_src-6277eaded1883e224015efcc5456e3c265e8b633.tar.gz chromium_src-6277eaded1883e224015efcc5456e3c265e8b633.tar.bz2 | |
Refactors menus so that I can create a MenuGtk implementation, and moves it into
the namespace views.
BUG=none
TEST=make sure I haven't broken any menus. This impacts all menus in
Chrome, except bookmark ones.
Review URL: http://codereview.chromium.org/113410
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_win.cc')
| -rw-r--r-- | chrome/browser/task_manager_win.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/task_manager_win.cc b/chrome/browser/task_manager_win.cc index 9fa0eba..d20d5a2 100644 --- a/chrome/browser/task_manager_win.cc +++ b/chrome/browser/task_manager_win.cc @@ -167,7 +167,7 @@ class TaskManagerViewImpl : public TaskManagerView, public views::TableViewObserver, public views::LinkController, public views::ContextMenuController, - public Menu::Delegate { + public views::Menu::Delegate { public: TaskManagerViewImpl(TaskManager* task_manager, TaskManagerModel* model); @@ -498,12 +498,13 @@ void TaskManagerViewImpl::ShowContextMenu(views::View* source, int y, bool is_mouse_gesture) { UpdateStatsCounters(); - Menu menu(this, Menu::TOPLEFT, source->GetWidget()->GetNativeView()); + scoped_ptr<views::Menu> menu(views::Menu::Create( + this, views::Menu::TOPLEFT, source->GetWidget()->GetNativeView())); for (std::vector<views::TableColumn>::iterator i = columns_.begin(); i != columns_.end(); ++i) { - menu.AppendMenuItem(i->id, i->title, Menu::CHECKBOX); + menu->AppendMenuItem(i->id, i->title, views::Menu::CHECKBOX); } - menu.RunMenuAt(x, y); + menu->RunMenuAt(x, y); } bool TaskManagerViewImpl::IsItemChecked(int id) const { |