diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 05:18:25 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 05:18:25 +0000 |
| commit | 0e3e7cbbea37a6303ddae4f7524968be622dca70 (patch) | |
| tree | d0384948596c7284f1c82767f2849049d33281c7 /ash/root_window_controller.cc | |
| parent | fda0eec93a1819e8662619a32ccb8e52e8666e39 (diff) | |
| download | chromium_src-0e3e7cbbea37a6303ddae4f7524968be622dca70.zip chromium_src-0e3e7cbbea37a6303ddae4f7524968be622dca70.tar.gz chromium_src-0e3e7cbbea37a6303ddae4f7524968be622dca70.tar.bz2 | |
Block keyboard and mouse input when maximize mode is activated by accelerometer.
BUG=353409
TEST=MaximizeModeControllerTest.BlocksKeyboardAndMouse
Review URL: https://codereview.chromium.org/230613004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263481 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 6477b14..3690dfe 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -721,13 +721,14 @@ void RootWindowController::Init(RootWindowType root_window_type, shell->InitKeyboard(); } else { root_window_layout()->OnWindowResized(); - shell->desktop_background_controller()->OnRootWindowAdded(root_window); - shell->high_contrast_controller()->OnRootWindowAdded(root_window); ash_host_->AsWindowTreeHost()->Show(); // Create a shelf if a user is already logged in. if (shell->session_state_delegate()->NumberOfLoggedInUsers()) shelf()->CreateShelf(); + + // Notify shell observers about new root window. + shell->OnRootWindowAdded(root_window); } } |