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

Unified Diff: views/controls/menu/native_menu_views.cc

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/menu/native_menu_views.h ('k') | views/controls/menu/native_menu_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/native_menu_views.cc
diff --git a/views/controls/menu/native_menu_views.cc b/views/controls/menu/native_menu_views.cc
index 10d3ccf1c25eab437a72be7c2ef5d2fc497e2a8e..ed8da66e9da55d8192ab74fb19d44ddad4981571 100644
--- a/views/controls/menu/native_menu_views.cc
+++ b/views/controls/menu/native_menu_views.cc
@@ -100,7 +100,7 @@ void NativeMenuViews::ExecuteCommand(int cmd) {
model->ActivatedAt(index);
}
-bool NativeMenuViews::GetAccelerator(int id, views::Accelerator* accelerator) {
+bool NativeMenuViews::GetAccelerator(int id, ui::Accelerator* accelerator) {
int index;
ui::MenuModel* model = model_;
if (!ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index))
@@ -110,8 +110,8 @@ bool NativeMenuViews::GetAccelerator(int id, views::Accelerator* accelerator) {
if (!model->GetAcceleratorAt(index, &menu_accelerator))
return false;
- *accelerator = views::Accelerator(menu_accelerator.key_code(),
- menu_accelerator.modifiers());
+ *accelerator = ui::Accelerator(menu_accelerator.key_code(),
+ menu_accelerator.modifiers());
return true;
}
« no previous file with comments | « views/controls/menu/native_menu_views.h ('k') | views/controls/menu/native_menu_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698