diff options
author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 19:32:50 +0000 |
---|---|---|
committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 19:32:50 +0000 |
commit | 51f43811e80869b16c437965f211b063418554f5 (patch) | |
tree | 37a9fd00d6999c22e8879db744c25d9dc39461dc /ash/shell.h | |
parent | 301a0be6f0366ec293e3364dbda09fe08a80d085 (diff) | |
download | chromium_src-51f43811e80869b16c437965f211b063418554f5.zip chromium_src-51f43811e80869b16c437965f211b063418554f5.tar.gz chromium_src-51f43811e80869b16c437965f211b063418554f5.tar.bz2 |
Add a full screen virtual keyboard to virtual keyboard root window
This relands https://codereview.chromium.org/47873003. It was reverted
because of VirtualKeyboardWindowControllerTest.VirtualKeyboardWindowTest
test crash on win8_aura.
R=oshima@chromium.org
TBR=jamescook, sadrul
BUG=310331
TEST=
1. add keyboard-usability-experiment flag
2. hook up an external screen
3. boot device
expected: a full screen keyboard on one of the screen
Review URL: https://codereview.chromium.org/62833010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r-- | ash/shell.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h index 6bab5b1..410be21 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -269,6 +269,9 @@ class ASH_EXPORT Shell // Called when the user logs in. void OnLoginStateChanged(user::LoginStatus status); + // Called after the logged-in user's profile is ready. + void OnLoginUserProfilePrepared(); + // Called when the login status changes. // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|. void UpdateAfterLoginStatusChange(user::LoginStatus status); @@ -283,6 +286,10 @@ class ASH_EXPORT Shell // Initializes |launcher_|. Does nothing if it's already initialized. void CreateLauncher(); + // Creates virtual keyboard. Deletes the old virtual keyboard if it's already + // exist. + void CreateKeyboard(); + // Show shelf view if it was created hidden (before session has started). void ShowLauncher(); @@ -539,8 +546,8 @@ class ASH_EXPORT Shell void Init(); - // Initializes virtual keyboard controller and attaches it to |root|. - void InitKeyboard(internal::RootWindowController* root); + // Initializes virtual keyboard controller. + void InitKeyboard(); // Initializes the root window so that it can host browser windows. void InitRootWindow(aura::Window* root_window); |