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

Unified Diff: views/controls/menu/menu.h

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/combobox/native_combobox_views.cc ('k') | views/controls/menu/menu_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu.h
diff --git a/views/controls/menu/menu.h b/views/controls/menu/menu.h
index 9397684ef8d45f55d5f9262fdb79a0f0c130ea20..b6a9633c853a1e89774fc1ebf5439b32cf7dd3ac 100644
--- a/views/controls/menu/menu.h
+++ b/views/controls/menu/menu.h
@@ -19,9 +19,11 @@ namespace gfx {
class Point;
}
-namespace views {
-
+namespace ui {
class Accelerator;
+}
+
+namespace views {
class VIEWS_EXPORT Menu {
public:
@@ -56,7 +58,7 @@ class VIEWS_EXPORT Menu {
// The delegate needs to implement this function if it wants to display
// the shortcut text next to each menu item. If there is an accelerator
// for a given item id, the implementor must return it.
- virtual bool GetAcceleratorInfo(int id, views::Accelerator* accel) {
+ virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel) {
return false;
}
« no previous file with comments | « views/controls/combobox/native_combobox_views.cc ('k') | views/controls/menu/menu_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698