OLD | NEW |
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 <queue> | 7 #include <queue> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
416 } | 416 } |
417 | 417 |
418 CloseChildWindows(); | 418 CloseChildWindows(); |
419 GetRootWindowSettings(root_window)->controller = NULL; | 419 GetRootWindowSettings(root_window)->controller = NULL; |
420 screen_dimmer_.reset(); | 420 screen_dimmer_.reset(); |
421 workspace_controller_.reset(); | 421 workspace_controller_.reset(); |
422 // Forget with the display ID so that display lookup | 422 // Forget with the display ID so that display lookup |
423 // ends up with invalid display. | 423 // ends up with invalid display. |
424 GetRootWindowSettings(root_window)->display_id = | 424 GetRootWindowSettings(root_window)->display_id = |
425 gfx::Display::kInvalidDisplayID; | 425 gfx::Display::kInvalidDisplayID; |
426 GetRootWindowSettings(root_window)->shutdown = true; | 426 ash_host_->PrepareForShutdown(); |
427 | 427 |
428 system_background_.reset(); | 428 system_background_.reset(); |
429 aura::client::SetScreenPositionClient(root_window, NULL); | 429 aura::client::SetScreenPositionClient(root_window, NULL); |
430 } | 430 } |
431 | 431 |
432 SystemModalContainerLayoutManager* | 432 SystemModalContainerLayoutManager* |
433 RootWindowController::GetSystemModalLayoutManager(aura::Window* window) { | 433 RootWindowController::GetSystemModalLayoutManager(aura::Window* window) { |
434 aura::Window* modal_container = NULL; | 434 aura::Window* modal_container = NULL; |
435 if (window) { | 435 if (window) { |
436 aura::Window* window_container = GetContainerForWindow(window); | 436 aura::Window* window_container = GetContainerForWindow(window); |
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1097 else | 1097 else |
1098 DisableTouchHudProjection(); | 1098 DisableTouchHudProjection(); |
1099 } | 1099 } |
1100 | 1100 |
1101 RootWindowController* GetRootWindowController( | 1101 RootWindowController* GetRootWindowController( |
1102 const aura::Window* root_window) { | 1102 const aura::Window* root_window) { |
1103 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; | 1103 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; |
1104 } | 1104 } |
1105 | 1105 |
1106 } // namespace ash | 1106 } // namespace ash |
OLD | NEW |