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

Unified Diff: chrome/browser/ui/views/toolbar_view.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/toolbar_view.h ('k') | chrome/browser/ui/views/unhandled_keyboard_event_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 79f226a16ac26bac1ede2e21db96e100b6940098..db25e0f02fe5ff2c9b986f8972153d752360ef94 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -445,13 +445,13 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id,
// TODO(cpu) Bug 1109102. Query WebKit land for the actual bindings.
switch (command_id) {
case IDC_CUT:
- *accelerator = views::Accelerator(ui::VKEY_X, false, true, false);
+ *accelerator = ui::Accelerator(ui::VKEY_X, false, true, false);
return true;
case IDC_COPY:
- *accelerator = views::Accelerator(ui::VKEY_C, false, true, false);
+ *accelerator = ui::Accelerator(ui::VKEY_C, false, true, false);
return true;
case IDC_PASTE:
- *accelerator = views::Accelerator(ui::VKEY_V, false, true, false);
+ *accelerator = ui::Accelerator(ui::VKEY_V, false, true, false);
return true;
}
// Else, we retrieve the accelerator information from the frame.
@@ -632,7 +632,7 @@ std::string ToolbarView::GetClassName() const {
return kViewClassName;
}
-bool ToolbarView::AcceleratorPressed(const views::Accelerator& accelerator) {
+bool ToolbarView::AcceleratorPressed(const ui::Accelerator& accelerator) {
const views::View* focused_view = focus_manager_->GetFocusedView();
if (focused_view == location_bar_)
return false; // Let location bar handle all accelerator events.
« no previous file with comments | « chrome/browser/ui/views/toolbar_view.h ('k') | chrome/browser/ui/views/unhandled_keyboard_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698