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

Unified Diff: ash/test/content/keyboard_controller_proxy_stub.cc

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 | « ash/test/content/keyboard_controller_proxy_stub.h ('k') | ash/test/test_keyboard_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/content/keyboard_controller_proxy_stub.cc
diff --git a/ash/test/content/keyboard_controller_proxy_stub.cc b/ash/test/content/keyboard_controller_proxy_stub.cc
deleted file mode 100644
index 255c61fb7d7897ce36d8b11f7a1d7a79ed7a52f4..0000000000000000000000000000000000000000
--- a/ash/test/content/keyboard_controller_proxy_stub.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 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.
-
-#include "ash/test/content/keyboard_controller_proxy_stub.h"
-
-#include "ash/content/shell_content_state.h"
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
-#include "ash/wm/window_util.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_tree_host.h"
-#include "ui/base/ime/mock_input_method.h"
-
-namespace ash {
-
-KeyboardControllerProxyStub::KeyboardControllerProxyStub()
- : keyboard::KeyboardControllerProxy(ShellContentState::GetInstance()
- ->GetActiveBrowserContext()) {}
-
-KeyboardControllerProxyStub::~KeyboardControllerProxyStub() {}
-
-bool KeyboardControllerProxyStub::HasKeyboardWindow() const {
- return keyboard_;
-}
-
-aura::Window* KeyboardControllerProxyStub::GetKeyboardWindow() {
- if (!keyboard_) {
- keyboard_.reset(new aura::Window(&delegate_));
- keyboard_->Init(ui::LAYER_NOT_DRAWN);
- }
- return keyboard_.get();
-}
-
-ui::InputMethod* KeyboardControllerProxyStub::GetInputMethod() {
- aura::Window* active_window = wm::GetActiveWindow();
- aura::Window* root_window = active_window ? active_window->GetRootWindow()
- : Shell::GetPrimaryRootWindow();
- return root_window->GetHost()->GetInputMethod();
-}
-
-void KeyboardControllerProxyStub::RequestAudioInput(
- content::WebContents* web_contents,
- const content::MediaStreamRequest& request,
- const content::MediaResponseCallback& callback) {}
-
-void KeyboardControllerProxyStub::LoadSystemKeyboard() {}
-
-void KeyboardControllerProxyStub::ReloadKeyboardIfNeeded() {}
-
-} // namespace ash
« no previous file with comments | « ash/test/content/keyboard_controller_proxy_stub.h ('k') | ash/test/test_keyboard_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698