Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

views/widget/widget_gtk.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/widget/widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 
@@ skipping 866 matching lines @@
     return false;
 
   KeyEvent key(event);
   int key_code = key.GetKeyCode();
   bool handled = false;
 
   // Always reset |should_handle_menu_key_release_| unless we are handling a
   // 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);
   }
 
   return handled;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WidgetGtk, protected:
 
 // static
@@ skipping 248 matching lines @@
   return false;
 }
 
 gboolean WidgetGtk::OnKeyEvent(GtkWidget* widget, GdkEventKey* event) {
   KeyEvent key(event);
 
   // Always reset |should_handle_menu_key_release_| unless we are handling a
   // 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;
 
   // Dispatch the key event to View hierarchy first.
   handled = root_view_->ProcessKeyEvent(key);
 
   // Dispatch the key event to native GtkWidget hierarchy.
   // To prevent GtkWindow from handling the key event as a keybinding, we need
   // to bypass GtkWindow's default key event handler and dispatch the event
@@ skipping 453 matching lines @@
     GtkWindow* window = GTK_WINDOW(element->data);
     DCHECK(window);
     RootView *root_view = FindRootView(window);
     if (root_view)
       root_view->NotifyLocaleChanged();
   }
   g_list_free(window_list);
 }
 
 }  // namespace views