diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 18:39:26 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 18:39:26 +0000 |
| commit | 8fd386fa4ea955ec1a0c6b3e42fd30baf17fde80 (patch) | |
| tree | f8ccafb02305bcecc9d18d7ac943029d442ed135 /ash/root_window_controller.cc | |
| parent | 66edcb54dd11f62cb6b255992a3bd63744953cc4 (diff) | |
| download | chromium_src-8fd386fa4ea955ec1a0c6b3e42fd30baf17fde80.zip chromium_src-8fd386fa4ea955ec1a0c6b3e42fd30baf17fde80.tar.gz chromium_src-8fd386fa4ea955ec1a0c6b3e42fd30baf17fde80.tar.bz2 | |
Revert 149869 because it broke ash_unittests on win_aura and linux_chromeos.
"""
2nd display should show the same background as login/lock screen:
Added special container for background on lock screen.
Background view can now be created in specific container.
Disabled lock screen wallpaper implementation based on serving PNG image via data source.
BUG=136853,137581
TEST=Lock screen on multimonitor configuration. Check that windows on secondary display are hidden with background.
Review URL: https://chromiumcodereview.appspot.com/10810039
TBR=antrim@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10829173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index b69d7d3..f2abcc5 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -6,7 +6,6 @@ #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" @@ -170,13 +169,6 @@ 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( @@ -286,9 +278,7 @@ void RootWindowController::CreateContainers() { void RootWindowController::CloseChildWindows() { // Close background widget first as it depends on tooltip. - root_window_->SetProperty(kWindowDesktopComponent, - static_cast<DesktopBackgroundWidgetController*>(NULL)); - + root_window_layout_->SetBackgroundWidget(NULL); workspace_controller_.reset(); aura::client::SetTooltipClient(root_window_.get(), NULL); |