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

Unified Diff: app/menus/accelerator_gtk.h

Issue 3165064: Move the keyboard files from base/ to app/. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: latest merge 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 | « app/menus/accelerator_cocoa.h ('k') | base/base.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/menus/accelerator_gtk.h
diff --git a/app/menus/accelerator_gtk.h b/app/menus/accelerator_gtk.h
index 86c83f792a9e4b399522e96e07ee29ee4410ac10..ca92f0332fd3aae94102776dc59fe4b072929687 100644
--- a/app/menus/accelerator_gtk.h
+++ b/app/menus/accelerator_gtk.h
@@ -8,15 +8,15 @@
#include <gdk/gdk.h>
+#include "app/keyboard_code_conversion_gtk.h"
+#include "app/keyboard_codes_posix.h"
#include "app/menus/accelerator.h"
-#include "base/keyboard_code_conversion_gtk.h"
-#include "base/keyboard_codes_posix.h"
namespace menus {
class AcceleratorGtk : public Accelerator {
public:
- AcceleratorGtk(base::KeyboardCode key_code,
+ AcceleratorGtk(app::KeyboardCode key_code,
bool shift_pressed, bool ctrl_pressed, bool alt_pressed)
: gdk_keyval_(0) {
key_code_ = key_code;
@@ -30,7 +30,7 @@ class AcceleratorGtk : public Accelerator {
}
AcceleratorGtk(guint keyval, GdkModifierType modifier_type) {
- key_code_ = base::WindowsKeyCodeForGdkKeyCode(keyval);
+ key_code_ = app::WindowsKeyCodeForGdkKeyCode(keyval);
gdk_keyval_ = keyval;
modifiers_ = modifier_type;
}
@@ -42,7 +42,7 @@ class AcceleratorGtk : public Accelerator {
return gdk_keyval_ > 0 ?
// The second parameter is false because accelerator keys are
// expressed in terms of the non-shift-modified key.
- gdk_keyval_ : base::GdkKeyCodeForWindowsKeyCode(key_code_, false);
+ gdk_keyval_ : app::GdkKeyCodeForWindowsKeyCode(key_code_, false);
}
GdkModifierType gdk_modifier_type() {
« no previous file with comments | « app/menus/accelerator_cocoa.h ('k') | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698