summaryrefslogtreecommitdiffstats
path: root/views/widget/widget_gtk.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:54:58 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:54:58 +0000
commit0cc3dfe387313821853e658a6e2fb3b729eac9e5 (patch)
tree6bdf4d23c62ae78cafc6e7c5a2599cce70dfef22 /views/widget/widget_gtk.cc
parent3c70591cc7d0d8cc162c10f7d3ac3b2ac15e4e69 (diff)
downloadchromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.zip
chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.gz
chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.bz2
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
Diffstat (limited to 'views/widget/widget_gtk.cc')
-rw-r--r--views/widget/widget_gtk.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 67d542f..0a129f6 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -884,21 +884,21 @@ bool WidgetGtk::HandleKeyboardEvent(GdkEventKey* event) {
// VKEY_MENU key release event. It ensures that VKEY_MENU accelerator can only
// be activated when handling a VKEY_MENU key release event which is preceded
// by an unhandled VKEY_MENU key press event.
- if (key_code != app::VKEY_MENU || event->type != GDK_KEY_RELEASE)
+ if (key_code != base::VKEY_MENU || event->type != GDK_KEY_RELEASE)
should_handle_menu_key_release_ = false;
if (event->type == GDK_KEY_PRESS) {
// VKEY_MENU is triggered by key release event.
// FocusManager::OnKeyEvent() returns false when the key has been consumed.
- if (key_code != app::VKEY_MENU)
+ if (key_code != base::VKEY_MENU)
handled = !focus_manager_->OnKeyEvent(key);
else
should_handle_menu_key_release_ = true;
- } else if (key_code == app::VKEY_MENU && should_handle_menu_key_release_ &&
+ } else if (key_code == base::VKEY_MENU && should_handle_menu_key_release_ &&
(key.GetFlags() & ~Event::EF_ALT_DOWN) == 0) {
// Trigger VKEY_MENU when only this key is pressed and released, and both
// press and release events are not handled by others.
- Accelerator accelerator(app::VKEY_MENU, false, false, false);
+ Accelerator accelerator(base::VKEY_MENU, false, false, false);
handled = focus_manager_->ProcessAccelerator(accelerator);
}
@@ -1167,7 +1167,7 @@ gboolean WidgetGtk::OnKeyEvent(GtkWidget* widget, GdkEventKey* event) {
// VKEY_MENU key release event. It ensures that VKEY_MENU accelerator can only
// be activated when handling a VKEY_MENU key release event which is preceded
// by an unhandled VKEY_MENU key press event. See also HandleKeyboardEvent().
- if (key.GetKeyCode() != app::VKEY_MENU || event->type != GDK_KEY_RELEASE)
+ if (key.GetKeyCode() != base::VKEY_MENU || event->type != GDK_KEY_RELEASE)
should_handle_menu_key_release_ = false;
bool handled = false;