From 0cc3dfe387313821853e658a6e2fb3b729eac9e5 Mon Sep 17 00:00:00 2001
From: "akalin@chromium.org"
<akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 2 Sep 2010 19:54:58 +0000
Subject: Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files
from base/ to app/.
Also moves the associated classes/enums from base:: to app::.
TEST=try bots compile
BUG=NONE
Review URL: http://codereview.chromium.org/3165064
TBR=bryeung@chromium.org
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3361003
TBR=bryeung@chromium.org
Review URL: http://codereview.chromium.org/3337006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98
---
app/menus/accelerator.h | 10 +++++-----
app/menus/accelerator_cocoa.h | 2 +-
app/menus/accelerator_gtk.h | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'app/menus')
diff --git a/app/menus/accelerator.h b/app/menus/accelerator.h
index 399569b..06adb99 100644
--- a/app/menus/accelerator.h
+++ b/app/menus/accelerator.h
@@ -6,7 +6,7 @@
#define APP_MENUS_ACCELERATOR_H_
#pragma once
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
namespace menus {
@@ -15,9 +15,9 @@ namespace menus {
class Accelerator {
public:
- Accelerator() : key_code_(app::VKEY_UNKNOWN), modifiers_(0) {}
+ Accelerator() : key_code_(base::VKEY_UNKNOWN), modifiers_(0) {}
- Accelerator(app::KeyboardCode keycode, int modifiers)
+ Accelerator(base::KeyboardCode keycode, int modifiers)
: key_code_(keycode),
modifiers_(modifiers) {}
@@ -52,7 +52,7 @@ class Accelerator {
return !(*this == rhs);
}
- app::KeyboardCode GetKeyCode() const {
+ base::KeyboardCode GetKeyCode() const {
return key_code_;
}
@@ -62,7 +62,7 @@ class Accelerator {
protected:
// The keycode (VK_...).
- app::KeyboardCode key_code_;
+ base::KeyboardCode key_code_;
// The state of the Shift/Ctrl/Alt keys (platform-dependent).
int modifiers_;
diff --git a/app/menus/accelerator_cocoa.h b/app/menus/accelerator_cocoa.h
index 71227fe..3eb879f 100644
--- a/app/menus/accelerator_cocoa.h
+++ b/app/menus/accelerator_cocoa.h
@@ -20,7 +20,7 @@ namespace menus {
class AcceleratorCocoa : public Accelerator {
public:
AcceleratorCocoa(NSString* key_code, NSUInteger mask)
- : Accelerator(app::VKEY_UNKNOWN, mask),
+ : Accelerator(base::VKEY_UNKNOWN, mask),
characters_([key_code copy]) {
}
diff --git a/app/menus/accelerator_gtk.h b/app/menus/accelerator_gtk.h
index ca92f03..86c83f7 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(app::KeyboardCode key_code,
+ AcceleratorGtk(base::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_ = app::WindowsKeyCodeForGdkKeyCode(keyval);
+ key_code_ = base::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_ : app::GdkKeyCodeForWindowsKeyCode(key_code_, false);
+ gdk_keyval_ : base::GdkKeyCodeForWindowsKeyCode(key_code_, false);
}
GdkModifierType gdk_modifier_type() {
--
cgit v1.1