diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 11:47:44 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 11:47:44 +0000 |
commit | 95db9c14ba28e571c925736bd7d52d1dd6fd092d (patch) | |
tree | 44a53d8e9515cdd327f1bb12e29a21f3cc9db482 /ash/root_window_controller.cc | |
parent | 39eefa5297bc6671e8e442a11308b85e4fd5e438 (diff) | |
download | chromium_src-95db9c14ba28e571c925736bd7d52d1dd6fd092d.zip chromium_src-95db9c14ba28e571c925736bd7d52d1dd6fd092d.tar.gz chromium_src-95db9c14ba28e571c925736bd7d52d1dd6fd092d.tar.bz2 |
Panels on 2nd launcher: step1
* Enable panel layout manager
* Specify the bounds for callout widgets so that it's
created within the same root window
* Set the bounds so that the panel will be created
in the current active display.
* Move panel windows when a display is disconnected.
* Added minimum tests
In next CL, I'll add "click and move", plus more tests.
BUG=166195
TEST=covered by test
Review URL: https://chromiumcodereview.appspot.com/12096057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
-rw-r--r-- | ash/root_window_controller.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index bbd611e..97cdf4a 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -111,6 +111,7 @@ void ReparentAllWindows(aura::RootWindow* src, aura::RootWindow* dst) { // Set of windows to move. const int kContainerIdsToMove[] = { internal::kShellWindowId_DefaultContainer, + internal::kShellWindowId_PanelContainer, internal::kShellWindowId_AlwaysOnTopContainer, internal::kShellWindowId_SystemModalContainer, internal::kShellWindowId_LockSystemModalContainer, @@ -296,9 +297,8 @@ void RootWindowController::InitForPrimaryDisplay() { workspace_controller()->SetShelf(shelf_); - // TODO(oshima): Disable panels on non primary display for now. - // crbug.com/166195. - if (root_window_ == Shell::GetPrimaryRootWindow()) { + if (Shell::IsLauncherPerDisplayEnabled() || + root_window_ == Shell::GetPrimaryRootWindow()) { // Create Panel layout manager aura::Window* panel_container = GetContainer( internal::kShellWindowId_PanelContainer); |