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 <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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 root_window); | 144 root_window); |
145 aura::Window* lock_screen_related_containers = CreateContainer( | 145 aura::Window* lock_screen_related_containers = CreateContainer( |
146 internal::kShellWindowId_LockScreenRelatedContainersContainer, | 146 internal::kShellWindowId_LockScreenRelatedContainersContainer, |
147 "LockScreenRelatedContainersContainer", | 147 "LockScreenRelatedContainersContainer", |
148 root_window); | 148 root_window); |
149 | 149 |
150 CreateContainer(internal::kShellWindowId_UnparentedControlContainer, | 150 CreateContainer(internal::kShellWindowId_UnparentedControlContainer, |
151 "UnparentedControlContainer", | 151 "UnparentedControlContainer", |
152 non_lock_screen_containers); | 152 non_lock_screen_containers); |
153 | 153 |
| 154 CreateContainer(internal::kShellWindowId_SystemBackgroundContainer, |
| 155 "SystemBackgroundContainer", non_lock_screen_containers); |
| 156 |
154 aura::Window* desktop_background_containers = CreateContainer( | 157 aura::Window* desktop_background_containers = CreateContainer( |
155 internal::kShellWindowId_DesktopBackgroundContainer, | 158 internal::kShellWindowId_DesktopBackgroundContainer, |
156 "DesktopBackgroundContainer", | 159 "DesktopBackgroundContainer", |
157 non_lock_screen_containers); | 160 non_lock_screen_containers); |
158 SetChildWindowVisibilityChangesAnimated(desktop_background_containers); | 161 SetChildWindowVisibilityChangesAnimated(desktop_background_containers); |
159 | 162 |
160 aura::Window* default_container = CreateContainer( | 163 aura::Window* default_container = CreateContainer( |
161 internal::kShellWindowId_DefaultContainer, | 164 internal::kShellWindowId_DefaultContainer, |
162 "DefaultContainer", | 165 "DefaultContainer", |
163 non_lock_screen_containers); | 166 non_lock_screen_containers); |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 // Restore focused or active window if it's still alive. | 366 // Restore focused or active window if it's still alive. |
364 if (focused && tracker.Contains(focused) && dst->Contains(focused)) { | 367 if (focused && tracker.Contains(focused) && dst->Contains(focused)) { |
365 dst->GetFocusManager()->SetFocusedWindow(focused, NULL); | 368 dst->GetFocusManager()->SetFocusedWindow(focused, NULL); |
366 } else if (active && tracker.Contains(active) && dst->Contains(active)) { | 369 } else if (active && tracker.Contains(active) && dst->Contains(active)) { |
367 activation_client->ActivateWindow(active); | 370 activation_client->ActivateWindow(active); |
368 } | 371 } |
369 } | 372 } |
370 | 373 |
371 } // namespace internal | 374 } // namespace internal |
372 } // namespace ash | 375 } // namespace ash |
OLD | NEW |