diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 23:34:50 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 23:34:50 +0000 |
| commit | 8039e06c060c94a67d8478bd81e2c0609c6b7b26 (patch) | |
| tree | d0e7f7b04a9fa21bd026978388781f82ce120ca7 /ash/root_window_controller.cc | |
| parent | 6cdd707b95c519e342df380b5ee9d177f7965dd2 (diff) | |
| download | chromium_src-8039e06c060c94a67d8478bd81e2c0609c6b7b26.zip chromium_src-8039e06c060c94a67d8478bd81e2c0609c6b7b26.tar.gz chromium_src-8039e06c060c94a67d8478bd81e2c0609c6b7b26.tar.bz2 | |
Enable launcher on all displays by default
Updated tests to work on both environment. I did this so that
we can just flip the flag when we need to turn this off.
BUG=166119
TEST=some tests were updated to work under this environment.
Review URL: https://chromiumcodereview.appspot.com/11975019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 543a084..b3d1f7e 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -451,6 +451,10 @@ void RootWindowController::MoveWindowsTo(aura::RootWindow* dst) { // be re-focused below. aura::client::GetFocusClient(dst)->FocusWindow(NULL); + // Forget the shelf early so that shelf don't update itself using wrong + // display info. + workspace_controller_->SetShelf(NULL); + ReparentAllWindows(root_window_.get(), dst); // Restore focused or active window if it's still alive. |