diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 20:18:28 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 20:18:28 +0000 |
| commit | e5a3debad33611a7e50737ebf2622b027304a791 (patch) | |
| tree | 5382f0aa72222a35492893ac715cffd8fdee997f /ash/root_window_controller.cc | |
| parent | e01f10b02186bbce91fc6c0a501a4c38c728f8b9 (diff) | |
| download | chromium_src-e5a3debad33611a7e50737ebf2622b027304a791.zip chromium_src-e5a3debad33611a7e50737ebf2622b027304a791.tar.gz chromium_src-e5a3debad33611a7e50737ebf2622b027304a791.tar.bz2 | |
Don't create panel container/layout manager for 2nd launcher.
Panels doesn't work on 2nd display right now. This will be fixed in m26.
BUG=166195
TEST=none
Review URL: https://codereview.chromium.org/11573037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index f726e21..1993e418 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -295,15 +295,19 @@ void RootWindowController::InitForPrimaryDisplay() { workspace_controller()->SetShelf(shelf_); - // Create Panel layout manager - aura::Window* panel_container = GetContainer( - internal::kShellWindowId_PanelContainer); - panel_layout_manager_ = - new internal::PanelLayoutManager(panel_container); - panel_container->AddPreTargetHandler( - new internal::PanelWindowEventFilter( - panel_container, panel_layout_manager_)); - panel_container->SetLayoutManager(panel_layout_manager_); + // TODO(oshima): Disable panels on non primary display for now. + // crbug.com/166195. + if (root_window_ == Shell::GetPrimaryRootWindow()) { + // Create Panel layout manager + aura::Window* panel_container = GetContainer( + internal::kShellWindowId_PanelContainer); + panel_layout_manager_ = + new internal::PanelLayoutManager(panel_container); + panel_container->AddPreTargetHandler( + new internal::PanelWindowEventFilter( + panel_container, panel_layout_manager_)); + panel_container->SetLayoutManager(panel_layout_manager_); + } if (shell_delegate->IsUserLoggedIn()) CreateLauncher(); |