Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index f2abcc5b679162339b00576c5fc5d804bded6f3f..84c2da277472978427c39340da9e7101efec5052 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -6,6 +6,7 @@ |
#include <vector> |
+#include "ash/desktop_background/desktop_background_component.h" |
#include "ash/display/display_controller.h" |
#include "ash/shell.h" |
#include "ash/shell_factory.h" |
@@ -169,6 +170,13 @@ void CreateContainersInRootWindow(aura::RootWindow* root_window) { |
non_lock_screen_containers); |
SetUsesScreenCoordinates(input_method_container); |
+ aura::Window* lock_background_containers = CreateContainer( |
+ internal::kShellWindowId_LockScreenBackgroundContainer, |
+ "LockScreenBackgroundContainer", |
+ lock_screen_containers); |
+ |
+ SetChildWindowVisibilityChangesAnimated(lock_background_containers); |
+ |
// TODO(beng): Figure out if we can make this use |
// SystemModalContainerEventFilter instead of stops_event_propagation. |
aura::Window* lock_container = CreateContainer( |
@@ -278,7 +286,9 @@ void RootWindowController::CreateContainers() { |
void RootWindowController::CloseChildWindows() { |
// Close background widget first as it depends on tooltip. |
- root_window_layout_->SetBackgroundWidget(NULL); |
+ root_window_->SetProperty(kWindowDesktopComponent, |
+ static_cast<DesktopBackgroundComponent*>(NULL)); |
+ |
workspace_controller_.reset(); |
aura::client::SetTooltipClient(root_window_.get(), NULL); |