Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(766)

Unified Diff: chrome/browser/ui/ash/ash_keyboard_controller_proxy.h

Issue 1392713002: Extract content dependency from keyboard code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
deleted file mode 100644
index d78d974583f5661b5d53901f3d9ca38e843cd2b6..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2013 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 CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_
-#define CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_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"
-
-namespace content {
-class BrowserContext;
-class WebContents;
-}
-namespace extensions {
-class ExtensionFunctionDispatcher;
-class WindowController;
-}
-namespace gfx {
-class Rect;
-}
-namespace keyboard {
-class KeyboardController;
-class KeyboardControllerObserver;
-}
-namespace ui {
-class InputMethod;
-}
-
-// Subclass of KeyboardControllerProxy. 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 {
- public:
- explicit AshKeyboardControllerProxy(content::BrowserContext* context);
- ~AshKeyboardControllerProxy() override;
-
- private:
- // keyboard::KeyboardControllerProxy overrides
- ui::InputMethod* GetInputMethod() override;
- void RequestAudioInput(
- content::WebContents* web_contents,
- const content::MediaStreamRequest& request,
- const content::MediaResponseCallback& callback) override;
- void SetupWebContents(content::WebContents* contents) override;
- void SetController(keyboard::KeyboardController* controller) override;
- void ShowKeyboardContainer(aura::Window* container) override;
-
- // The overridden implementation dispatches
- // chrome.virtualKeyboardPrivate.onTextInputBoxFocused event to extension to
- // provide the input type information. Naturally, when the virtual keyboard
- // extension is used as an IME then chrome.input.ime.onFocus provides the
- // information, but not when the virtual keyboard is used in conjunction with
- // another IME. virtualKeyboardPrivate.onTextInputBoxFocused is the remedy in
- // that case.
- void SetUpdateInputType(ui::TextInputType type) override;
-
- // content::WebContentsObserver overrides
- void RenderViewCreated(content::RenderViewHost* render_view_host) override;
-
- scoped_ptr<keyboard::KeyboardControllerObserver> observer_;
-
- DISALLOW_COPY_AND_ASSIGN(AshKeyboardControllerProxy);
-};
-
-#endif // CHROME_BROWSER_UI_ASH_ASH_KEYBOARD_CONTROLLER_PROXY_H_
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698