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

Unified Diff: ash/shell.cc

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Cleanup. Created 4 years, 3 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 4a83bc5a4e97aabed13f9c9ef7b14edae52c7c32..40530321ed74b4c9fb6a9aede864fea4dadea641 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -57,8 +57,6 @@
#include "ash/shell_init_params.h"
#include "ash/system/chromeos/screen_layout_observer.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"
@@ -626,7 +624,6 @@ Shell::~Shell() {
#if defined(OS_CHROMEOS)
resolution_notification_controller_.reset();
#endif
- wallpaper_controller_.reset();
screenshot_controller_.reset();
mouse_cursor_filter_.reset();
modality_filter_.reset();
@@ -887,9 +884,6 @@ void Shell::Init(const ShellInitParams& init_params) {
event_client_.reset(new EventClientImpl);
- // This controller needs to be set before SetupManagedWindowMode.
- wallpaper_controller_.reset(new WallpaperController(blocking_pool_));
-
session_state_delegate_.reset(
wm_shell_->delegate()->CreateSessionStateDelegate());
wm_shell_->CreatePointerWatcherAdapter();

Powered by Google App Engine
This is Rietveld 408576698