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

Side by Side Diff: ash/shell.h

Issue 2921973002: Hide Night Light behind a flag (Closed)
Patch Set: Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
13 #include "ash/metrics/user_metrics_recorder.h" 13 #include "ash/metrics/user_metrics_recorder.h"
14 #include "ash/public/cpp/shelf_types.h" 14 #include "ash/public/cpp/shelf_types.h"
15 #include "ash/session/session_observer.h" 15 #include "ash/session/session_observer.h"
16 #include "ash/system/night_light/night_light_controller.h"
16 #include "ash/wm/system_modal_container_event_filter_delegate.h" 17 #include "ash/wm/system_modal_container_event_filter_delegate.h"
17 #include "base/gtest_prod_util.h" 18 #include "base/gtest_prod_util.h"
18 #include "base/macros.h" 19 #include "base/macros.h"
19 #include "base/memory/weak_ptr.h" 20 #include "base/memory/weak_ptr.h"
20 #include "base/observer_list.h" 21 #include "base/observer_list.h"
21 #include "ui/aura/window.h" 22 #include "ui/aura/window.h"
22 #include "ui/display/screen.h" 23 #include "ui/display/screen.h"
23 #include "ui/events/event_target.h" 24 #include "ui/events/event_target.h"
24 #include "ui/wm/core/cursor_manager.h" 25 #include "ui/wm/core/cursor_manager.h"
25 #include "ui/wm/public/activation_change_observer.h" 26 #include "ui/wm/public/activation_change_observer.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 class LocaleNotificationController; 118 class LocaleNotificationController;
118 class LockStateController; 119 class LockStateController;
119 class LogoutConfirmationController; 120 class LogoutConfirmationController;
120 class LockScreenController; 121 class LockScreenController;
121 class MagnificationController; 122 class MagnificationController;
122 class MaximizeModeController; 123 class MaximizeModeController;
123 class MediaController; 124 class MediaController;
124 class MouseCursorEventFilter; 125 class MouseCursorEventFilter;
125 class MruWindowTracker; 126 class MruWindowTracker;
126 class NewWindowController; 127 class NewWindowController;
127 class NightLightController;
128 class OverlayEventFilter; 128 class OverlayEventFilter;
129 class PaletteDelegate; 129 class PaletteDelegate;
130 class PartialMagnificationController; 130 class PartialMagnificationController;
131 class PowerButtonController; 131 class PowerButtonController;
132 class PowerEventObserver; 132 class PowerEventObserver;
133 class ProjectingObserver; 133 class ProjectingObserver;
134 class ResizeShadowController; 134 class ResizeShadowController;
135 class ResolutionNotificationController; 135 class ResolutionNotificationController;
136 class RootWindowController; 136 class RootWindowController;
137 class ShellPort; 137 class ShellPort;
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 } 331 }
332 MaximizeModeController* maximize_mode_controller() { 332 MaximizeModeController* maximize_mode_controller() {
333 return maximize_mode_controller_.get(); 333 return maximize_mode_controller_.get();
334 } 334 }
335 MediaController* media_controller() { return media_controller_.get(); } 335 MediaController* media_controller() { return media_controller_.get(); }
336 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); } 336 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
337 NewWindowController* new_window_controller() { 337 NewWindowController* new_window_controller() {
338 return new_window_controller_.get(); 338 return new_window_controller_.get();
339 } 339 }
340 NightLightController* night_light_controller() { 340 NightLightController* night_light_controller() {
341 DCHECK(NightLightController::IsFeatureEnabled());
James Cook 2017/06/02 23:40:05 If you want to do this I would move the implementa
afakhry 2017/06/03 00:09:02 Done.
341 return night_light_controller_.get(); 342 return night_light_controller_.get();
342 } 343 }
343 SessionController* session_controller() { return session_controller_.get(); } 344 SessionController* session_controller() { return session_controller_.get(); }
344 ShelfController* shelf_controller() { return shelf_controller_.get(); } 345 ShelfController* shelf_controller() { return shelf_controller_.get(); }
345 ShelfModel* shelf_model(); 346 ShelfModel* shelf_model();
346 ShutdownController* shutdown_controller() { 347 ShutdownController* shutdown_controller() {
347 return shutdown_controller_.get(); 348 return shutdown_controller_.get();
348 } 349 }
349 SystemTrayController* system_tray_controller() { 350 SystemTrayController* system_tray_controller() {
350 return system_tray_controller_.get(); 351 return system_tray_controller_.get();
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 base::ObserverList<ShellObserver> shell_observers_; 827 base::ObserverList<ShellObserver> shell_observers_;
827 828
828 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 829 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
829 830
830 DISALLOW_COPY_AND_ASSIGN(Shell); 831 DISALLOW_COPY_AND_ASSIGN(Shell);
831 }; 832 };
832 833
833 } // namespace ash 834 } // namespace ash
834 835
835 #endif // ASH_SHELL_H_ 836 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698