Re-lands 58186:

views/controls/textfield/textfield.h

Index: views/controls/textfield/textfield.h
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index 564243e2135bb04d735dc249e3fcfab99be6861f..3bd6c319e64bc7348b1ca7149c985c09281bd129 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -14,8 +14,8 @@
 
 #include <string>
 
+#include "app/keyboard_codes.h"
 #include "base/basictypes.h"
-#include "base/keyboard_codes.h"
 #if !defined(OS_LINUX)
 #include "base/logging.h"
 #endif
@@ -65,7 +65,7 @@ class Textfield : public View {
     }
     const GdkEventKey* event() const { return &event_; }
 #endif
-    base::KeyboardCode GetKeyboardCode() const;
+    app::KeyboardCode GetKeyboardCode() const;
     bool IsControlHeld() const;
     bool IsShiftHeld() const;