| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/desktop_background/desktop_background_controller.h" | 5 #include "ash/desktop_background/desktop_background_controller.h" |
| 6 | 6 |
| 7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
| 8 #include "ash/common/display/display_info.h" | 8 #include "ash/common/display/display_info.h" |
| 9 #include "ash/common/shell_window_ids.h" | 9 #include "ash/common/shell_window_ids.h" |
| 10 #include "ash/common/wallpaper/wallpaper_delegate.h" |
| 10 #include "ash/common/wm_shell.h" | 11 #include "ash/common/wm_shell.h" |
| 11 #include "ash/desktop_background/desktop_background_controller_observer.h" | 12 #include "ash/desktop_background/desktop_background_controller_observer.h" |
| 12 #include "ash/desktop_background/desktop_background_view.h" | 13 #include "ash/desktop_background/desktop_background_view.h" |
| 13 #include "ash/desktop_background/desktop_background_widget_controller.h" | 14 #include "ash/desktop_background/desktop_background_widget_controller.h" |
| 14 #include "ash/desktop_background/user_wallpaper_delegate.h" | |
| 15 #include "ash/root_window_controller.h" | 15 #include "ash/root_window_controller.h" |
| 16 #include "ash/shell.h" | 16 #include "ash/shell.h" |
| 17 #include "base/bind.h" | 17 #include "base/bind.h" |
| 18 #include "base/logging.h" | 18 #include "base/logging.h" |
| 19 #include "base/threading/sequenced_worker_pool.h" | 19 #include "base/threading/sequenced_worker_pool.h" |
| 20 #include "components/wallpaper/wallpaper_resizer.h" | 20 #include "components/wallpaper/wallpaper_resizer.h" |
| 21 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
| 22 #include "ui/display/screen.h" | 22 #include "ui/display/screen.h" |
| 23 #include "ui/views/widget/widget.h" | 23 #include "ui/views/widget/widget.h" |
| 24 | 24 |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 return moved; | 245 return moved; |
| 246 } | 246 } |
| 247 | 247 |
| 248 int DesktopBackgroundController::GetBackgroundContainerId(bool locked) { | 248 int DesktopBackgroundController::GetBackgroundContainerId(bool locked) { |
| 249 return locked ? kShellWindowId_LockScreenBackgroundContainer | 249 return locked ? kShellWindowId_LockScreenBackgroundContainer |
| 250 : kShellWindowId_DesktopBackgroundContainer; | 250 : kShellWindowId_DesktopBackgroundContainer; |
| 251 } | 251 } |
| 252 | 252 |
| 253 void DesktopBackgroundController::UpdateWallpaper(bool clear_cache) { | 253 void DesktopBackgroundController::UpdateWallpaper(bool clear_cache) { |
| 254 current_wallpaper_.reset(); | 254 current_wallpaper_.reset(); |
| 255 Shell::GetInstance()->user_wallpaper_delegate()->UpdateWallpaper(clear_cache); | 255 WmShell::Get()->wallpaper_delegate()->UpdateWallpaper(clear_cache); |
| 256 } | 256 } |
| 257 | 257 |
| 258 } // namespace ash | 258 } // namespace ash |
| OLD | NEW |