| 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/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/desktop_background/desktop_background_controller_observer.h" | 8 #include "ash/desktop_background/desktop_background_controller_observer.h" |
| 9 #include "ash/desktop_background/desktop_background_view.h" | 9 #include "ash/desktop_background/desktop_background_view.h" |
| 10 #include "ash/desktop_background/desktop_background_widget_controller.h" | 10 #include "ash/desktop_background/desktop_background_widget_controller.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 VLOG(1) << "SetWallpaper: image_id=" << WallpaperResizer::GetImageId(image) | 90 VLOG(1) << "SetWallpaper: image_id=" << WallpaperResizer::GetImageId(image) |
| 91 << " layout=" << layout; | 91 << " layout=" << layout; |
| 92 | 92 |
| 93 if (WallpaperIsAlreadyLoaded(image, true /* compare_layouts */, layout)) { | 93 if (WallpaperIsAlreadyLoaded(image, true /* compare_layouts */, layout)) { |
| 94 VLOG(1) << "Wallpaper is already loaded"; | 94 VLOG(1) << "Wallpaper is already loaded"; |
| 95 return false; | 95 return false; |
| 96 } | 96 } |
| 97 | 97 |
| 98 current_wallpaper_.reset(new WallpaperResizer( | 98 current_wallpaper_.reset(new WallpaperResizer( |
| 99 image, GetMaxDisplaySizeInNative(), layout, blocking_pool_)); | 99 image, GetMaxDisplaySizeInNative(), layout, blocking_pool_)); |
| 100 current_wallpaper_->StartResize(); | 100 // current_wallpaper_->StartResize(); |
| 101 | 101 |
| 102 FOR_EACH_OBSERVER(DesktopBackgroundControllerObserver, | 102 FOR_EACH_OBSERVER(DesktopBackgroundControllerObserver, |
| 103 observers_, | 103 observers_, |
| 104 OnWallpaperDataChanged()); | 104 OnWallpaperDataChanged()); |
| 105 SetDesktopBackgroundImageMode(); | 105 SetDesktopBackgroundImageMode(); |
| 106 return true; | 106 return true; |
| 107 } | 107 } |
| 108 | 108 |
| 109 void DesktopBackgroundController::CreateEmptyWallpaper() { | 109 void DesktopBackgroundController::CreateEmptyWallpaper() { |
| 110 current_wallpaper_.reset(NULL); | 110 current_wallpaper_.reset(NULL); |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 : kShellWindowId_DesktopBackgroundContainer; | 276 : kShellWindowId_DesktopBackgroundContainer; |
| 277 } | 277 } |
| 278 | 278 |
| 279 void DesktopBackgroundController::UpdateWallpaper(bool clear_cache) { | 279 void DesktopBackgroundController::UpdateWallpaper(bool clear_cache) { |
| 280 current_wallpaper_.reset(NULL); | 280 current_wallpaper_.reset(NULL); |
| 281 ash::Shell::GetInstance()->user_wallpaper_delegate()->UpdateWallpaper( | 281 ash::Shell::GetInstance()->user_wallpaper_delegate()->UpdateWallpaper( |
| 282 clear_cache); | 282 clear_cache); |
| 283 } | 283 } |
| 284 | 284 |
| 285 } // namespace ash | 285 } // namespace ash |
| OLD | NEW |