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

Unified Diff: ash/shell.cc

Issue 2290473004: Rename ash desktop_background to wallpaper. (Closed)
Patch Set: Address comments. Created 4 years, 4 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
« no previous file with comments | « ash/shell.h ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 689c6853eb9950f68becadcf4b34193537e43401..505c7307a6b90c0df1e66f5e6bc1a584b2d91fd0 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -38,8 +38,6 @@
#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm/window_positioner.h"
#include "ash/common/wm_shell.h"
-#include "ash/desktop_background/desktop_background_controller.h"
-#include "ash/desktop_background/desktop_background_view.h"
#include "ash/display/cursor_window_controller.h"
#include "ash/display/display_configuration_controller.h"
#include "ash/display/display_manager.h"
@@ -57,6 +55,8 @@
#include "ash/root_window_controller.h"
#include "ash/shell_init_params.h"
#include "ash/utility/screenshot_controller.h"
+#include "ash/wallpaper/wallpaper_controller.h"
+#include "ash/wallpaper/wallpaper_view.h"
#include "ash/wm/ash_focus_rules.h"
#include "ash/wm/ash_native_cursor_manager.h"
#include "ash/wm/event_client_impl.h"
@@ -637,7 +637,7 @@ Shell::~Shell() {
#if defined(OS_CHROMEOS)
resolution_notification_controller_.reset();
#endif
- desktop_background_controller_.reset();
+ wallpaper_controller_.reset();
screenshot_controller_.reset();
mouse_cursor_filter_.reset();
modality_filter_.reset();
@@ -899,8 +899,7 @@ void Shell::Init(const ShellInitParams& init_params) {
event_client_.reset(new EventClientImpl);
// This controller needs to be set before SetupManagedWindowMode.
- desktop_background_controller_.reset(
- new DesktopBackgroundController(blocking_pool_));
+ wallpaper_controller_.reset(new WallpaperController(blocking_pool_));
session_state_delegate_.reset(
wm_shell_->delegate()->CreateSessionStateDelegate());
« no previous file with comments | « ash/shell.h ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698