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

Unified Diff: ash/shell.h

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 5 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.h
diff --git a/ash/shell.h b/ash/shell.h
index b2b430429dbe2c055af9f097ea6d2a05a3b002de..7b109fe85c8f754975714256635c52853da275ea 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -14,7 +14,6 @@
#include "ash/metrics/user_metrics_recorder.h"
#include "ash/wm/cursor_manager_chromeos.h"
#include "ash/wm/system_modal_container_event_filter_delegate.h"
-#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -367,8 +366,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
}
::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); }
- ShellDelegate* delegate() { return delegate_.get(); }
-
UserWallpaperDelegate* user_wallpaper_delegate() {
return user_wallpaper_delegate_.get();
}
@@ -595,7 +592,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
std::unique_ptr<AcceleratorController> accelerator_controller_;
- std::unique_ptr<ShellDelegate> delegate_;
std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
std::unique_ptr<SessionStateDelegate> session_state_delegate_;
std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;

Powered by Google App Engine
This is Rietveld 408576698