Re-lands 58186:

views/controls/native_control.h

 // Copyright (c) 2006-2008 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_NATIVE_CONTROL_H_
 #define VIEWS_CONTROLS_NATIVE_CONTROL_H_
 #pragma once
 
 #include <windows.h>
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "views/view.h"
 
 namespace views {
 
 class NativeViewHost;
 class NativeControlContainer;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // NativeControl is an abstract view that is used to implement views wrapping
@@ skipping 52 matching lines @@
   // Overridden so that the control properly reflects parent's visibility.
   virtual void VisibilityChanged(View* starting_from, bool is_visible);
 
   // Controls that have fixed sizes should call these methods to specify the
   // actual size and how they should be aligned within their parent.
   void SetFixedWidth(int width, Alignment alignment);
   void SetFixedHeight(int height, Alignment alignment);
 
   // Invoked when a key is pressed on the control.
   // Should return true if the key message was processed, false otherwise.
-  virtual bool OnKeyDown(base::KeyboardCode virtual_key_code) { return false; }
+  virtual bool OnKeyDown(app::KeyboardCode virtual_key_code) { return false; }
 
   // Returns additional extended style flags. When subclasses call
   // CreateWindowEx in order to create the underlying control, they must OR the
   // ExStyle parameter with the value returned by this function.
   //
   // We currently use this method in order to add flags such as WS_EX_LAYOUTRTL
   // to the HWND for views with right-to-left UI layout.
   DWORD GetAdditionalExStyle() const;
 
   // TODO(xji): we use the following temporary function as we transition the
@@ skipping 21 matching lines @@
                                                WPARAM w_param, LPARAM l_param);
 
   NativeControlContainer* container_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeControl);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_NATIVE_CONTROL_H_