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

Unified Diff: views/widget/widget_gtk.cc

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 | « views/widget/root_view.cc ('k') | views/window/dialog_client_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/widget_gtk.cc
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 0a129f62485ec0f08a0546ceaea73c7d2b94933f..67d542fdd7284b45ae664cabc64493666499b59d 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 != base::VKEY_MENU || event->type != GDK_KEY_RELEASE)
+ if (key_code != app::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 != base::VKEY_MENU)
+ if (key_code != app::VKEY_MENU)
handled = !focus_manager_->OnKeyEvent(key);
else
should_handle_menu_key_release_ = true;
- } else if (key_code == base::VKEY_MENU && should_handle_menu_key_release_ &&
+ } else if (key_code == app::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(base::VKEY_MENU, false, false, false);
+ Accelerator accelerator(app::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() != base::VKEY_MENU || event->type != GDK_KEY_RELEASE)
+ if (key.GetKeyCode() != app::VKEY_MENU || event->type != GDK_KEY_RELEASE)
should_handle_menu_key_release_ = false;
bool handled = false;
« no previous file with comments | « views/widget/root_view.cc ('k') | views/window/dialog_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698