| 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() {
|
|
|