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/shell.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/shell.cc')
| -rw-r--r-- | ash/shell.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index e4dec64..98f7346 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -396,6 +396,10 @@ void Shell::OnMaximizeModeEnded() { FOR_EACH_OBSERVER(ShellObserver, observers_, OnMaximizeModeEnded()); } +void Shell::OnRootWindowAdded(aura::Window* root_window) { + FOR_EACH_OBSERVER(ShellObserver, observers_, OnRootWindowAdded(root_window)); +} + void Shell::CreateShelf() { RootWindowControllerList controllers = GetAllRootWindowControllers(); for (RootWindowControllerList::iterator iter = controllers.begin(); @@ -698,6 +702,7 @@ Shell::~Shell() { video_activity_notifier_.reset(); #endif // defined(OS_CHROMEOS) video_detector_.reset(); + high_contrast_controller_.reset(); shadow_controller_.reset(); resize_shadow_controller_.reset(); |