Extract content dependency from keyboard code

chrome/browser/ui/ash/chrome_keyboard_ui.h

Index: chrome/browser/ui/ash/chrome_keyboard_ui.h
diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h b/chrome/browser/ui/ash/chrome_keyboard_ui.h
similarity index 75%
rename from chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
rename to chrome/browser/ui/ash/chrome_keyboard_ui.h
index d78d974583f5661b5d53901f3d9ca38e843cd2b6..d2413247476aa2176f8fc74d9271631938c3ab46 100644
--- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
+++ b/chrome/browser/ui/ash/chrome_keyboard_ui.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_
-#define CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_
+#ifndef CHROME_BROWSER_UI_ASH_CHROME_KEYBOARD_UI_H_
+#define CHROME_BROWSER_UI_ASH_CHROME_KEYBOARD_UI_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "ui/keyboard/keyboard_controller_proxy.h"
+#include "ui/keyboard/content/keyboard_ui_content.h"
 
 namespace content {
 class BrowserContext;
@@ -29,14 +29,13 @@ namespace ui {
 class InputMethod;
 }
 
-// Subclass of KeyboardControllerProxy. It is used by KeyboardController to get
+// Subclass of KeyboardUIContent. It is used by KeyboardController to get
 // access to the virtual keyboard window and setup Chrome extension functions.
-class AshKeyboardControllerProxy
-    : public keyboard::KeyboardControllerProxy,
-      public content::WebContentsObserver {
+class ChromeKeyboardUI : public keyboard::KeyboardUIContent,
+                         public content::WebContentsObserver {
  public:
-  explicit AshKeyboardControllerProxy(content::BrowserContext* context);
-  ~AshKeyboardControllerProxy() override;
+  explicit ChromeKeyboardUI(content::BrowserContext* context);
+  ~ChromeKeyboardUI() override;
 
  private:
   // keyboard::KeyboardControllerProxy overrides
@@ -63,7 +62,7 @@ class AshKeyboardControllerProxy
 
   scoped_ptr<keyboard::KeyboardControllerObserver> observer_;
 
-  DISALLOW_COPY_AND_ASSIGN(AshKeyboardControllerProxy);
+  DISALLOW_COPY_AND_ASSIGN(ChromeKeyboardUI);
 };
 
-#endif  // CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_
+#endif  // CHROME_BROWSER_UI_ASH_CHROME_KEYBOARD_UI_H_