OLD | NEW |
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 "chrome/browser/ui/views/action_box_context_menu.h" | 5 #include "chrome/browser/ui/views/action_box_context_menu.h" |
6 | 6 |
7 #include "chrome/browser/ui/toolbar/action_box_context_menu_controller.h" | 7 #include "chrome/browser/ui/toolbar/action_box_context_menu_controller.h" |
8 #include "ui/gfx/point.h" | 8 #include "ui/gfx/point.h" |
9 #include "ui/gfx/size.h" | 9 #include "ui/gfx/size.h" |
10 #include "ui/views/controls/menu/menu_model_adapter.h" | 10 #include "ui/views/controls/menu/menu_model_adapter.h" |
11 #include "ui/views/controls/menu/menu_runner.h" | 11 #include "ui/views/controls/menu/menu_runner.h" |
12 | 12 |
13 using views::MenuRunner; | 13 using views::MenuRunner; |
14 | 14 |
15 ActionBoxContextMenu::ActionBoxContextMenu( | 15 ActionBoxContextMenu::ActionBoxContextMenu( |
16 Browser* browser, | 16 Browser* browser, |
17 const extensions::Extension* extension) | 17 const extensions::Extension* extension) |
18 : controller_(browser, extension) { | 18 : controller_(browser, extension) { |
19 } | 19 } |
20 | 20 |
21 ActionBoxContextMenu::~ActionBoxContextMenu() { | 21 ActionBoxContextMenu::~ActionBoxContextMenu() { |
22 } | 22 } |
23 | 23 |
24 views::MenuRunner::RunResult ActionBoxContextMenu::RunMenuAt( | 24 views::MenuRunner::RunResult ActionBoxContextMenu::RunMenuAt( |
25 const gfx::Point& p, | 25 const gfx::Point& p, |
26 views::Widget* parent_widget) { | 26 views::Widget* parent_widget, |
| 27 ui::MenuSourceType source_type) { |
27 adapter_.reset(new views::MenuModelAdapter(controller_.menu_model())); | 28 adapter_.reset(new views::MenuModelAdapter(controller_.menu_model())); |
28 menu_runner_.reset(new MenuRunner(adapter_->CreateMenu())); | 29 menu_runner_.reset(new MenuRunner(adapter_->CreateMenu())); |
29 return menu_runner_->RunMenuAt( | 30 return menu_runner_->RunMenuAt( |
30 parent_widget, | 31 parent_widget, |
31 NULL, // No menu button. | 32 NULL, // No menu button. |
32 gfx::Rect(p, gfx::Size()), | 33 gfx::Rect(p, gfx::Size()), |
33 views::MenuItemView::TOPLEFT, | 34 views::MenuItemView::TOPLEFT, |
| 35 source_type, |
34 (MenuRunner::CONTEXT_MENU | MenuRunner::IS_NESTED | | 36 (MenuRunner::CONTEXT_MENU | MenuRunner::IS_NESTED | |
35 MenuRunner::HAS_MNEMONICS)); | 37 MenuRunner::HAS_MNEMONICS)); |
36 } | 38 } |
OLD | NEW |