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

Unified Diff: ash/root_window_controller.h

Issue 13164002: Create and show the virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix upstream Created 7 years, 8 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/ash.gyp ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index ea3f316e4da85cdb325db045ad12168f02209de5..1bd6ae8ca0610c05cc1da4f7c449faef7ac90fd0 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -30,6 +30,10 @@ class RootWindowEventFilter;
}
}
+namespace keyboard {
+class KeyboardController;
+}
+
namespace ash {
class StackingController;
class ShelfWidget;
@@ -174,11 +178,16 @@ class ASH_EXPORT RootWindowController {
// types in the shell UI.
void CreateContainersInRootWindow(aura::RootWindow* root_window);
+ // Initializes the virtual keyboard.
+ void InitKeyboard();
+
scoped_ptr<aura::RootWindow> root_window_;
RootWindowLayoutManager* root_window_layout_;
scoped_ptr<StackingController> stacking_controller_;
+ scoped_ptr<keyboard::KeyboardController> keyboard_controller_;
+
// The shelf for managing the launcher and the status widget.
scoped_ptr<ShelfWidget> shelf_;
« no previous file with comments | « ash/ash.gyp ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698