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

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: Add a TODO 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 | « ash/root_window_controller_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index f3d47e8e23e1efa1e8d419c6747404f20d2150c2..d7a6632de0b83961b4f5fbfc6adf2395dc04e66c 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();
}
@@ -502,6 +511,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.
@@ -540,6 +552,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_;
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698