| OLD | NEW |
| 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> |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 return lock_screen_controller_.get(); | 330 return lock_screen_controller_.get(); |
| 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 return night_light_controller_.get(); | |
| 342 } | |
| 343 SessionController* session_controller() { return session_controller_.get(); } | 341 SessionController* session_controller() { return session_controller_.get(); } |
| 344 ShelfController* shelf_controller() { return shelf_controller_.get(); } | 342 ShelfController* shelf_controller() { return shelf_controller_.get(); } |
| 345 ShelfModel* shelf_model(); | 343 ShelfModel* shelf_model(); |
| 346 ShutdownController* shutdown_controller() { | 344 ShutdownController* shutdown_controller() { |
| 347 return shutdown_controller_.get(); | 345 return shutdown_controller_.get(); |
| 348 } | 346 } |
| 349 SystemTrayController* system_tray_controller() { | 347 SystemTrayController* system_tray_controller() { |
| 350 return system_tray_controller_.get(); | 348 return system_tray_controller_.get(); |
| 351 } | 349 } |
| 352 SystemTrayDelegate* system_tray_delegate() { | 350 SystemTrayDelegate* system_tray_delegate() { |
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 826 base::ObserverList<ShellObserver> shell_observers_; | 824 base::ObserverList<ShellObserver> shell_observers_; |
| 827 | 825 |
| 828 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 826 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 829 | 827 |
| 830 DISALLOW_COPY_AND_ASSIGN(Shell); | 828 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 831 }; | 829 }; |
| 832 | 830 |
| 833 } // namespace ash | 831 } // namespace ash |
| 834 | 832 |
| 835 #endif // ASH_SHELL_H_ | 833 #endif // ASH_SHELL_H_ |
| OLD | NEW |