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

Unified Diff: ash/shell.h

Issue 2910773002: cros: CustomFrameViewAsh avatar icon from a window prop (Closed)
Patch Set: add test Created 3 years, 7 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/shelf/shelf_locking_manager_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index da3e7d69fe2fe275ab7a3ec288b6161b07e2cfa6..fb61a73e370a90e7c7ae7491fd1bb53a2b37013b 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -143,7 +143,6 @@ class ScreenshotController;
class ScreenPinningController;
class ScreenPositionController;
class SessionController;
-class SessionStateDelegate;
class ShelfController;
class ShelfModel;
class ShelfWindowWatcher;
@@ -416,10 +415,6 @@ class ASH_EXPORT Shell : public SessionObserver,
}
::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); }
- SessionStateDelegate* session_state_delegate() {
- return session_state_delegate_.get();
- }
-
HighContrastController* high_contrast_controller() {
return high_contrast_controller_.get();
}
@@ -682,7 +677,6 @@ class ASH_EXPORT Shell : public SessionObserver,
std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
- std::unique_ptr<SessionStateDelegate> session_state_delegate_;
std::unique_ptr<WindowPositioner> window_positioner_;
std::unique_ptr<AcceleratorController> accelerator_controller_;
« no previous file with comments | « ash/shelf/shelf_locking_manager_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698