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

Unified Diff: ash/display/virtual_keyboard_window_controller.h

Issue 62833010: Reland "Add a full screen virtual keyboard to virtual keyboard root window" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: format nit. The main change is patchset 2 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/display_controller.h ('k') | ash/display/virtual_keyboard_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/virtual_keyboard_window_controller.h
diff --git a/ash/display/virtual_keyboard_window_controller.h b/ash/display/virtual_keyboard_window_controller.h
index def3c06fc99814944a0f206134a41d397e74a28f..88db57d7b012a445ccdea5f915d866bed3314e90 100644
--- a/ash/display/virtual_keyboard_window_controller.h
+++ b/ash/display/virtual_keyboard_window_controller.h
@@ -9,8 +9,16 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
+namespace keyboard {
+class KeyboardController;
+}
+
namespace ash {
+namespace test {
+class VirtualKeyboardWindowControllerTest;
+} // namespace test
+
namespace internal {
class DisplayInfo;
class RootWindowController;
@@ -22,6 +30,8 @@ class ASH_EXPORT VirtualKeyboardWindowController {
VirtualKeyboardWindowController();
virtual ~VirtualKeyboardWindowController();
+ void ActivateKeyboard(keyboard::KeyboardController* keyboard_controller);
+
// Updates the root window's bounds using |display_info|.
// Creates the new root window if one doesn't exist.
void UpdateWindow(const DisplayInfo& display_info);
@@ -30,6 +40,12 @@ class ASH_EXPORT VirtualKeyboardWindowController {
void Close();
private:
+ friend class test::VirtualKeyboardWindowControllerTest;
+
+ RootWindowController* root_window_controller_for_test() {
+ return root_window_controller_.get();
+ }
+
scoped_ptr<RootWindowController> root_window_controller_;
DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardWindowController);
« no previous file with comments | « ash/display/display_controller.h ('k') | ash/display/virtual_keyboard_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698