Re-lands 58186:

views/event_gtk.cc

Index: views/event_gtk.cc
diff --git a/views/event_gtk.cc b/views/event_gtk.cc
index cb76e76a05115916cb30b322bce4c1ed68144a7a..6ffd449fd9b94e0386d07a25202eb8191a24d62f 100644
--- a/views/event_gtk.cc
+++ b/views/event_gtk.cc
@@ -6,7 +6,7 @@
 
 #include <gdk/gdk.h>
 
-#include "base/keyboard_code_conversion_gtk.h"
+#include "app/keyboard_code_conversion_gtk.h"
 
 namespace views {
 
@@ -15,7 +15,7 @@ KeyEvent::KeyEvent(GdkEventKey* event)
             Event::ET_KEY_PRESSED : Event::ET_KEY_RELEASED,
             GetFlagsFromGdkState(event->state)),
       // TODO(erg): All these values are iffy.
-      key_code_(base::WindowsKeyCodeForGdkKeyCode(event->keyval)),
+      key_code_(app::WindowsKeyCodeForGdkKeyCode(event->keyval)),
       repeat_count_(0),
       message_flags_(0) {
 }