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

Unified Diff: app/menus/accelerator.h

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months 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 | « app/keyboard_codes_win.h ('k') | app/menus/accelerator_cocoa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/menus/accelerator.h
===================================================================
--- app/menus/accelerator.h (revision 71220)
+++ app/menus/accelerator.h (working copy)
@@ -6,7 +6,7 @@
#define APP_MENUS_ACCELERATOR_H_
#pragma once
-#include "app/keyboard_codes.h"
+#include "ui/base/keycodes/keyboard_codes.h"
namespace menus {
@@ -15,9 +15,9 @@
class Accelerator {
public:
- Accelerator() : key_code_(app::VKEY_UNKNOWN), modifiers_(0) {}
+ Accelerator() : key_code_(ui::VKEY_UNKNOWN), modifiers_(0) {}
- Accelerator(app::KeyboardCode keycode, int modifiers)
+ Accelerator(ui::KeyboardCode keycode, int modifiers)
: key_code_(keycode),
modifiers_(modifiers) {}
@@ -52,7 +52,7 @@
return !(*this == rhs);
}
- app::KeyboardCode GetKeyCode() const {
+ ui::KeyboardCode GetKeyCode() const {
return key_code_;
}
@@ -62,7 +62,7 @@
protected:
// The keycode (VK_...).
- app::KeyboardCode key_code_;
+ ui::KeyboardCode key_code_;
// The state of the Shift/Ctrl/Alt keys (platform-dependent).
int modifiers_;
« no previous file with comments | « app/keyboard_codes_win.h ('k') | app/menus/accelerator_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698