Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Side by Side Diff: ash/root_window_controller.cc

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/desktop_background/desktop_background_widget_controller.h" 9 #include "ash/desktop_background/desktop_background_widget_controller.h"
10 #include "ash/display/display_controller.h" 10 #include "ash/display/display_controller.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 panel_layout_manager_(NULL) { 157 panel_layout_manager_(NULL) {
158 SetRootWindowController(root_window, this); 158 SetRootWindowController(root_window, this);
159 screen_dimmer_.reset(new ScreenDimmer(root_window)); 159 screen_dimmer_.reset(new ScreenDimmer(root_window));
160 } 160 }
161 161
162 RootWindowController::~RootWindowController() { 162 RootWindowController::~RootWindowController() {
163 Shutdown(); 163 Shutdown();
164 root_window_.reset(); 164 root_window_.reset();
165 } 165 }
166 166
167 // static
168 internal::RootWindowController*
169 RootWindowController::ForLauncher(aura::Window* window) {
170 if (Shell::IsLauncherPerDisplayEnabled())
171 return GetRootWindowController(window->GetRootWindow());
172 else
173 return Shell::GetPrimaryRootWindowController();
174 }
175
167 void RootWindowController::Shutdown() { 176 void RootWindowController::Shutdown() {
168 CloseChildWindows(); 177 CloseChildWindows();
169 if (Shell::GetActiveRootWindow() == root_window_.get()) { 178 if (Shell::GetActiveRootWindow() == root_window_.get()) {
170 Shell::GetInstance()->set_active_root_window( 179 Shell::GetInstance()->set_active_root_window(
171 Shell::GetPrimaryRootWindow() == root_window_.get() ? 180 Shell::GetPrimaryRootWindow() == root_window_.get() ?
172 NULL : Shell::GetPrimaryRootWindow()); 181 NULL : Shell::GetPrimaryRootWindow());
173 } 182 }
174 SetRootWindowController(root_window_.get(), NULL); 183 SetRootWindowController(root_window_.get(), NULL);
175 screen_dimmer_.reset(); 184 screen_dimmer_.reset();
176 workspace_controller_.reset(); 185 workspace_controller_.reset();
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 572
564 aura::Window* overlay_container = CreateContainer( 573 aura::Window* overlay_container = CreateContainer(
565 kShellWindowId_OverlayContainer, 574 kShellWindowId_OverlayContainer,
566 "OverlayContainer", 575 "OverlayContainer",
567 lock_screen_related_containers); 576 lock_screen_related_containers);
568 SetUsesScreenCoordinates(overlay_container); 577 SetUsesScreenCoordinates(overlay_container);
569 } 578 }
570 579
571 } // namespace internal 580 } // namespace internal
572 } // namespace ash 581 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.h ('k') | ash/screen_ash.cc » ('j') | ash/screen_ash.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698