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

Unified Diff: views/accelerator.h

Issue 3337006: Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 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 | « remoting/host/event_executor_win.cc ('k') | views/accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/accelerator.h
===================================================================
--- views/accelerator.h (revision 58389)
+++ views/accelerator.h (working copy)
@@ -23,10 +23,10 @@
public:
Accelerator() : menus::Accelerator() {}
- Accelerator(app::KeyboardCode keycode, int modifiers)
+ Accelerator(base::KeyboardCode keycode, int modifiers)
: menus::Accelerator(keycode, modifiers) {}
- Accelerator(app::KeyboardCode keycode,
+ Accelerator(base::KeyboardCode keycode,
bool shift_pressed, bool ctrl_pressed, bool alt_pressed) {
key_code_ = keycode;
modifiers_ = 0;
« no previous file with comments | « remoting/host/event_executor_win.cc ('k') | views/accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698