Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Side by Side Diff: ui/app_list/views/app_list_menu_views.cc

Issue 331993009: MacViews: Run native Cocoa context menus to support Services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add VIEWS_EXPORT for unit test access Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/app_list/views/app_list_menu_views.h" 5 #include "ui/app_list/views/app_list_menu_views.h"
6 6
7 #include "grit/ui_resources.h" 7 #include "grit/ui_resources.h"
8 #include "ui/app_list/app_list_view_delegate.h" 8 #include "ui/app_list/app_list_view_delegate.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/views/controls/button/menu_button.h" 10 #include "ui/views/controls/button/menu_button.h"
11 #include "ui/views/controls/image_view.h" 11 #include "ui/views/controls/image_view.h"
12 #include "ui/views/controls/label.h" 12 #include "ui/views/controls/label.h"
13 #include "ui/views/controls/menu/menu_config.h" 13 #include "ui/views/controls/menu/menu_config.h"
14 #include "ui/views/controls/menu/menu_item_view.h" 14 #include "ui/views/controls/menu/menu_item_view.h"
15 #include "ui/views/controls/menu/submenu_view.h" 15 #include "ui/views/controls/menu/submenu_view.h"
16 #include "ui/views/layout/grid_layout.h" 16 #include "ui/views/layout/grid_layout.h"
17 17
18 using views::MenuItemView; 18 using views::MenuItemView;
19 19
20 namespace app_list { 20 namespace app_list {
21 21
22 AppListMenuViews::AppListMenuViews(AppListViewDelegate* delegate) 22 AppListMenuViews::AppListMenuViews(AppListViewDelegate* delegate)
23 : AppListMenu(delegate) { 23 : AppListMenu(delegate) {
24 menu_delegate_.reset(new views::MenuModelAdapter(menu_model())); 24 menu_delegate_.reset(new views::MenuModelAdapter(menu_model()));
25 menu_ = new MenuItemView(menu_delegate_.get()); 25 menu_ = new MenuItemView(menu_delegate_.get());
26 menu_runner_.reset(new views::MenuRunner(menu_)); 26 menu_runner_.reset(new views::MenuRunner(menu_, 0));
27 menu_delegate_->BuildMenu(menu_); 27 menu_delegate_->BuildMenu(menu_);
28 } 28 }
29 29
30 AppListMenuViews::~AppListMenuViews() {} 30 AppListMenuViews::~AppListMenuViews() {}
31 31
32 void AppListMenuViews::RunMenuAt(views::MenuButton* button, 32 void AppListMenuViews::RunMenuAt(views::MenuButton* button,
33 const gfx::Point& point) { 33 const gfx::Point& point) {
34 ignore_result(menu_runner_->RunMenuAt(button->GetWidget(), 34 ignore_result(menu_runner_->RunMenuAt(button->GetWidget(),
35 button, 35 button,
36 gfx::Rect(point, gfx::Size()), 36 gfx::Rect(point, gfx::Size()),
37 views::MENU_ANCHOR_TOPRIGHT, 37 views::MENU_ANCHOR_TOPRIGHT,
38 ui::MENU_SOURCE_NONE, 38 ui::MENU_SOURCE_NONE));
39 0));
40 } 39 }
41 40
42 void AppListMenuViews::Cancel() { 41 void AppListMenuViews::Cancel() {
43 menu_runner_->Cancel(); 42 menu_runner_->Cancel();
44 } 43 }
45 44
46 } // namespace app_list 45 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698