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

Unified Diff: ash/shell.h

Issue 2857103007: [Night Light] CL2: Ash and system tray work (Closed)
Patch Set: Exclude one test from mash 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
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 0a5fb1535017445c8b0bfde0789d97c1c1707e22..c2808a6fea9b59c01bbdd7e368ccfb269e6fcd64 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -121,6 +121,7 @@ class MediaController;
class MouseCursorEventFilter;
class MruWindowTracker;
class NewWindowController;
+class NightLightController;
class OverlayEventFilter;
class PaletteDelegate;
class PartialMagnificationController;
@@ -326,6 +327,9 @@ class ASH_EXPORT Shell : public SessionObserver,
return new_window_controller_.get();
}
SessionController* session_controller() { return session_controller_.get(); }
+ NightLightController* night_light_controller() {
James Cook 2017/05/05 17:12:30 optional: alphabetize
afakhry 2017/05/05 20:04:10 Done.
+ return night_light_controller_.get();
+ }
ShelfController* shelf_controller() { return shelf_controller_.get(); }
ShelfModel* shelf_model();
ShutdownController* shutdown_controller() {
@@ -682,6 +686,7 @@ class ASH_EXPORT Shell : public SessionObserver,
std::unique_ptr<PaletteDelegate> palette_delegate_;
std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
std::unique_ptr<SessionController> session_controller_;
+ std::unique_ptr<NightLightController> night_light_controller_;
James Cook 2017/05/05 17:12:30 but you can't alphabetize here of course :-)
afakhry 2017/05/05 20:04:10 Yes, of course! :)
std::unique_ptr<ShelfController> shelf_controller_;
std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
std::unique_ptr<ShellDelegate> shell_delegate_;

Powered by Google App Engine
This is Rietveld 408576698