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

Unified Diff: chrome/browser/ui/views/tab_contents/render_view_context_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
Index: chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
index d9d6339a34c6db1dda0f173dec436aaf801d5e32..125e1c4f4c829879ec04ade08814879edd3ea5f9 100644
--- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
+++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_views.cc
@@ -13,7 +13,7 @@
#include "content/browser/tab_contents/tab_contents_view.h"
#include "grit/generated_resources.h"
#include "ui/base/keycodes/keyboard_codes.h"
-#include "views/accelerator.h"
+#include "ui/base/models/accelerator.h"
#include "views/controls/menu/menu_item_view.h"
#include "views/controls/menu/menu_model_adapter.h"
#include "views/controls/menu/menu_runner.h"
@@ -69,32 +69,32 @@ bool RenderViewContextMenuViews::GetAcceleratorForCommandId(
// that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
switch (command_id) {
case IDC_CONTENT_CONTEXT_UNDO:
- *accel = views::Accelerator(ui::VKEY_Z, false, true, false);
+ *accel = ui::Accelerator(ui::VKEY_Z, false, true, false);
return true;
case IDC_CONTENT_CONTEXT_REDO:
// TODO(jcampan): should it be Ctrl-Y?
- *accel = views::Accelerator(ui::VKEY_Z, true, true, false);
+ *accel = ui::Accelerator(ui::VKEY_Z, true, true, false);
return true;
case IDC_CONTENT_CONTEXT_CUT:
- *accel = views::Accelerator(ui::VKEY_X, false, true, false);
+ *accel = ui::Accelerator(ui::VKEY_X, false, true, false);
return true;
case IDC_CONTENT_CONTEXT_COPY:
- *accel = views::Accelerator(ui::VKEY_C, false, true, false);
+ *accel = ui::Accelerator(ui::VKEY_C, false, true, false);
return true;
case IDC_CONTENT_CONTEXT_PASTE:
- *accel = views::Accelerator(ui::VKEY_V, false, true, false);
+ *accel = ui::Accelerator(ui::VKEY_V, false, true, false);
return true;
case IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE:
- *accel = views::Accelerator(ui::VKEY_V, true, true, false);
+ *accel = ui::Accelerator(ui::VKEY_V, true, true, false);
return true;
case IDC_CONTENT_CONTEXT_SELECTALL:
- *accel = views::Accelerator(ui::VKEY_A, false, true, false);
+ *accel = ui::Accelerator(ui::VKEY_A, false, true, false);
return true;
default:
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.h ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698