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

Unified Diff: chrome/browser/ui/views/wrench_menu.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 | « chrome/browser/ui/views/wrench_menu.h ('k') | ui/base/models/accelerator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/wrench_menu.cc
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index e3fbcfa0ffa45b5822ff5f6d77dde9bc96573937..e098423985459fbf02b4eb4d15aeb2c089d16523 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -257,8 +257,8 @@ string16 GetAccessibleNameForWrenchMenuItem(
ui::Accelerator menu_accelerator;
if (model->GetAcceleratorAt(item_index, &menu_accelerator)) {
accelerator_text =
- views::Accelerator(menu_accelerator.key_code(),
- menu_accelerator.modifiers()).GetShortcutText();
+ ui::Accelerator(menu_accelerator.key_code(),
+ menu_accelerator.modifiers()).GetShortcutText();
}
return MenuItemView::GetAccessibleNameForMenuItem(
@@ -747,7 +747,7 @@ void WrenchMenu::ExecuteCommand(int id, int mouse_event_flags) {
return entry.first->ActivatedAt(entry.second);
}
-bool WrenchMenu::GetAccelerator(int id, views::Accelerator* accelerator) {
+bool WrenchMenu::GetAccelerator(int id, ui::Accelerator* accelerator) {
if (is_bookmark_command(id))
return false;
@@ -762,8 +762,8 @@ bool WrenchMenu::GetAccelerator(int id, views::Accelerator* accelerator) {
if (!entry.first->GetAcceleratorAt(entry.second, &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 | « chrome/browser/ui/views/wrench_menu.h ('k') | ui/base/models/accelerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698