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

Unified Diff: ash/root_window_controller.h

Issue 25111002: Only show virtual keyboard on primary root window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move container_ initialization back Created 7 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 | « no previous file | ash/root_window_controller.cc » ('j') | ash/root_window_controller.cc » ('J')
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 49ce6b89f89ab2d10e90b6fb5f1c2c68a7e9bda2..8cbb3b4939d3af15532635198aaf2f23b97ffe1a 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -102,10 +102,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
return always_on_top_controller_.get();
}
- keyboard::KeyboardController* keyboard_controller() {
- return keyboard_controller_.get();
- }
-
ScreenDimmer* screen_dimmer() { return screen_dimmer_.get(); }
// Access the shelf associated with this root window controller,
@@ -214,6 +210,12 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
// windows are in fullscreen state, the topmost one is preferred.
const aura::Window* GetTopmostFullscreenWindow() const;
+ // Enable virtual keyboard on current root window controller.
+ void EnableKeyboard(keyboard::KeyboardController* keyboard_controller);
+
+ // Disable virtual keyboard on current root window controller.
+ void DisableKeyboard(keyboard::KeyboardController* keyboard_controller);
+
private:
void InitLayoutManagers();
@@ -225,9 +227,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
// types in the shell UI.
void CreateContainersInRootWindow(aura::RootWindow* root_window);
- // Initializes the virtual keyboard.
- void InitKeyboard();
-
// Enables projection touch HUD.
void EnableTouchHudProjection();
@@ -243,8 +242,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
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 | « no previous file | ash/root_window_controller.cc » ('j') | ash/root_window_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698