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

Unified Diff: ash/keyboard_controller_proxy_stub.h

Issue 74693002: . (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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/display/virtual_keyboard_window_controller_unittest.cc ('k') | ash/keyboard_controller_proxy_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/keyboard_controller_proxy_stub.h
diff --git a/ash/shell/keyboard_controller_proxy_stub.h b/ash/keyboard_controller_proxy_stub.h
similarity index 65%
rename from ash/shell/keyboard_controller_proxy_stub.h
rename to ash/keyboard_controller_proxy_stub.h
index 639e5d26fa59822a5dc0907f75110033b0684166..25310d716012678fc6c4b05fef83e1b973ec0969 100644
--- a/ash/shell/keyboard_controller_proxy_stub.h
+++ b/ash/keyboard_controller_proxy_stub.h
@@ -2,26 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_
-#define ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_
+#ifndef ASH_KEYBOARD_CONTROLLER_PROXY_STUB_H_
+#define ASH_KEYBOARD_CONTROLLER_PROXY_STUB_H_
-#include "ui/aura/test/test_window_delegate.h"
+#include "ash/ash_export.h"
#include "ui/keyboard/keyboard_controller_proxy.h"
-namespace aura {
-class Window;
-} // namespace aura
-
namespace ash {
// Stub implementation of KeyboardControllerProxy
-class KeyboardControllerProxyStub : public keyboard::KeyboardControllerProxy {
+class ASH_EXPORT KeyboardControllerProxyStub
+ : public keyboard::KeyboardControllerProxy {
public:
KeyboardControllerProxyStub();
virtual ~KeyboardControllerProxyStub();
- virtual aura::Window* GetKeyboardWindow() OVERRIDE;
-
private:
// Overridden from keyboard::KeyboardControllerProxy:
virtual content::BrowserContext* GetBrowserContext() OVERRIDE;
@@ -30,10 +25,9 @@ class KeyboardControllerProxyStub : public keyboard::KeyboardControllerProxy {
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback) OVERRIDE;
- aura::test::TestWindowDelegate delegate_;
DISALLOW_COPY_AND_ASSIGN(KeyboardControllerProxyStub);
};
} // namespace ash
-#endif // ASH_SHELL_KEYBOARD_CONTROLLER_PROXY_STUB_H_
+#endif // ASH_KEYBOARD_CONTROLLER_PROXY_STUB_H_
« no previous file with comments | « ash/display/virtual_keyboard_window_controller_unittest.cc ('k') | ash/keyboard_controller_proxy_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698