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

views/controls/textfield/textfield.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
 #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
 #include "base/string16.h"
 #include "gfx/font.h"
 #include "views/view.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 #ifdef UNIT_TEST
 #include "gfx/native_widget_types.h"
@@ skipping 29 matching lines @@
     unsigned int message() const { return message_; }
     wchar_t key() const { return key_; }
     int repeat_count() const { return repeat_count_; }
     unsigned int flags() const { return flags_; }
 #else
     explicit Keystroke(GdkEventKey* event)
         : event_(*event) {
     }
     const GdkEventKey* event() const { return &event_; }
 #endif
-    app::KeyboardCode GetKeyboardCode() const;
+    base::KeyboardCode GetKeyboardCode() const;
     bool IsControlHeld() const;
     bool IsShiftHeld() const;
 
    private:
 #if defined(OS_WIN)
     unsigned int message_;
     wchar_t key_;
     int repeat_count_;
     unsigned int flags_;
 #else
@@ skipping 213 matching lines @@
 
   // Text to display when empty.
   string16 text_to_display_when_empty_;
 
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_