diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 15:34:25 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 15:34:25 +0000 |
| commit | 8fef7430a5222bc786c669945d97139794618f54 (patch) | |
| tree | f6c1df7b767e6c64ee3cc143b652ff94bf0fcbd8 /ash/shell.cc | |
| parent | 979b48da6e16cd33d2132aae2dd7c1c426a6a95c (diff) | |
| download | chromium_src-8fef7430a5222bc786c669945d97139794618f54.zip chromium_src-8fef7430a5222bc786c669945d97139794618f54.tar.gz chromium_src-8fef7430a5222bc786c669945d97139794618f54.tar.bz2 | |
Add always on top windows to the alt+tab list
BUG=114631
TEST=Open Google Talk. Try to alt+tab away from it, and then back.
Review URL: https://chromiumcodereview.appspot.com/10700057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index a340aa1..3e21f2f 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -457,7 +457,8 @@ void Shell::Init() { high_contrast_controller_.reset(new HighContrastController); video_detector_.reset(new VideoDetector); - window_cycle_controller_.reset(new WindowCycleController); + window_cycle_controller_.reset( + new WindowCycleController(activation_controller_.get())); tooltip_controller_.reset(new internal::TooltipController( drag_drop_controller_.get())); @@ -704,6 +705,7 @@ void Shell::InitRootWindowController( DCHECK(visibility_controller_.get()); DCHECK(drag_drop_controller_.get()); DCHECK(capture_controller_.get()); + DCHECK(window_cycle_controller_.get()); root_window->set_focus_manager(focus_manager_.get()); input_method_filter_->SetInputMethodPropertyInRootWindow(root_window); @@ -735,6 +737,8 @@ void Shell::InitRootWindowController( root_window->GetChildById(internal::kShellWindowId_AlwaysOnTopContainer)); root_window->SetProperty(internal::kAlwaysOnTopControllerKey, always_on_top_controller); + + window_cycle_controller_->OnRootWindowAdded(root_window); } //////////////////////////////////////////////////////////////////////////////// |