cros: WallpaperController reparent based on session state

ash/wallpaper/wallpaper_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wallpaper/wallpaper_controller.h"
 
 #include <string>
 #include <utility>
 
 #include "ash/ash_switches.h"
@@ skipping 150 matching lines @@
   InstallDesktopControllerForAllWindows();
 }
 
 void WallpaperController::CreateEmptyWallpaper() {
   SetProminentColor(kInvalidColor);
   current_wallpaper_.reset();
   wallpaper_mode_ = WALLPAPER_IMAGE;
   InstallDesktopControllerForAllWindows();
 }
 
-bool WallpaperController::MoveToLockedContainer() {
-  if (locked_)
-    return false;
-  locked_ = true;
-  return ReparentWallpaper(GetWallpaperContainerId(true));
-}
-
-bool WallpaperController::MoveToUnlockedContainer() {
-  if (!locked_)
-    return false;
-  locked_ = false;
-  return ReparentWallpaper(GetWallpaperContainerId(false));
-}
-
 void WallpaperController::OnDisplayConfigurationChanged() {
   gfx::Size max_display_size = GetMaxDisplaySizeInNative();
   if (current_max_display_size_ != max_display_size) {
     current_max_display_size_ = max_display_size;
     if (wallpaper_mode_ == WALLPAPER_IMAGE && current_wallpaper_) {
       timer_.Stop();
       timer_.Start(FROM_HERE,
                    base::TimeDelta::FromMilliseconds(wallpaper_reload_delay_),
                    base::Bind(&WallpaperController::UpdateWallpaper,
                               base::Unretained(this), false /* clear cache */));
@@ skipping 13 matching lines @@
     if (wallpaper_mode_ == WALLPAPER_IMAGE && current_wallpaper_)
       UpdateWallpaper(true /* clear cache */);
   }
 
   InstallDesktopController(root_window);
 }
 
 void WallpaperController::OnSessionStateChanged(
     session_manager::SessionState state) {
   CalculateWallpaperColors();
+
+  if (state == session_manager::SessionState::ACTIVE)
+    MoveToUnlockedContainer();
+  else
+    MoveToLockedContainer();
 }
 
 // static
 gfx::Size WallpaperController::GetMaxDisplaySizeInNative() {
   // Return an empty size for test environments where the screen is null.
   if (!display::Screen::GetScreen())
     return gfx::Size();
 
   // Note that |shell_port| is null when this is called from Chrome running in
   // Mash.
@@ skipping 166 matching lines @@
 }
 
 bool WallpaperController::ShouldCalculateColors() const {
   gfx::ImageSkia image = GetWallpaper();
   return IsShelfColoringEnabled() &&
          Shell::Get()->session_controller()->GetSessionState() ==
              session_manager::SessionState::ACTIVE &&
          !image.isNull();
 }
 
+bool WallpaperController::MoveToLockedContainer() {
+  if (locked_)
+    return false;
+
+  locked_ = true;
+  return ReparentWallpaper(GetWallpaperContainerId(true));
+}
+
+bool WallpaperController::MoveToUnlockedContainer() {
+  if (!locked_)
+    return false;
+
+  locked_ = false;
+  return ReparentWallpaper(GetWallpaperContainerId(false));
+}
+
 }  // namespace ash