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

Unified Diff: ash/root_window_controller.cc

Issue 10810039: 2nd display should show the same background as login/lock screen: (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Post-review fix #2 Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index f2abcc5b679162339b00576c5fc5d804bded6f3f..b69d7d3195239240a81318521caaa860fe4a7f14 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"
@@ -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<DesktopBackgroundWidgetController*>(NULL));
+
workspace_controller_.reset();
aura::client::SetTooltipClient(root_window_.get(), NULL);

Powered by Google App Engine
This is Rietveld 408576698