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

Unified Diff: ash/shell.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
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index b6caac11295831d76f4125c67c10699dc384feaa..17ea25c8e39f89ee06c8909071c8e5c9bfc2605a 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -49,6 +49,11 @@ class ImageSkia;
class Point;
class Rect;
}
+
+namespace keyboard {
+class KeyboardController;
+}
+
namespace ui {
class Layer;
}
@@ -276,6 +281,10 @@ class ASH_EXPORT Shell
void AddShellObserver(ShellObserver* observer);
void RemoveShellObserver(ShellObserver* observer);
+ keyboard::KeyboardController* keyboard_controller() {
+ return keyboard_controller_.get();
+ }
+
AcceleratorController* accelerator_controller() {
return accelerator_controller_.get();
}
@@ -493,6 +502,9 @@ class ASH_EXPORT Shell
void Init();
+ // Initializes virtual keyboard controller and attaches it to |root|.
+ void InitKeyboard(internal::RootWindowController* root);
+
// Initializes the root window and root window controller so that it
// can host browser windows. |first_run_after_boot| is true for the
// primary display only first time after boot.
@@ -531,6 +543,7 @@ class ASH_EXPORT Shell
std::vector<WindowAndBoundsPair> to_restore_;
+ scoped_ptr<keyboard::KeyboardController> keyboard_controller_;
scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
scoped_ptr<AcceleratorController> accelerator_controller_;
scoped_ptr<ShellDelegate> delegate_;

Powered by Google App Engine
This is Rietveld 408576698