| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index 33420b4d46cc31f7afebd8d4e1b3e37a8877377e..cfc82acacb128cd2217cd95e60e1480af7368765 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_widget_controller.h"
|
| #include "ash/display/display_controller.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell_factory.h"
|
| @@ -168,6 +169,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(
|
| @@ -277,7 +285,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<DesktopBackgroundWidgetController*>(NULL));
|
| +
|
| workspace_controller_.reset();
|
| aura::client::SetTooltipClient(root_window_.get(), NULL);
|
|
|
|
|