| 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 <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 } | 361 } |
| 362 PowerButtonController* power_button_controller() { | 362 PowerButtonController* power_button_controller() { |
| 363 return power_button_controller_.get(); | 363 return power_button_controller_.get(); |
| 364 } | 364 } |
| 365 LockStateController* lock_state_controller() { | 365 LockStateController* lock_state_controller() { |
| 366 return lock_state_controller_.get(); | 366 return lock_state_controller_.get(); |
| 367 } | 367 } |
| 368 MruWindowTracker* mru_window_tracker() { | 368 MruWindowTracker* mru_window_tracker() { |
| 369 return mru_window_tracker_.get(); | 369 return mru_window_tracker_.get(); |
| 370 } | 370 } |
| 371 ::wm::UserActivityDetector* user_activity_detector() { | |
| 372 return user_activity_detector_.get(); | |
| 373 } | |
| 374 VideoDetector* video_detector() { | 371 VideoDetector* video_detector() { |
| 375 return video_detector_.get(); | 372 return video_detector_.get(); |
| 376 } | 373 } |
| 377 WindowCycleController* window_cycle_controller() { | 374 WindowCycleController* window_cycle_controller() { |
| 378 return window_cycle_controller_.get(); | 375 return window_cycle_controller_.get(); |
| 379 } | 376 } |
| 380 WindowSelectorController* window_selector_controller() { | 377 WindowSelectorController* window_selector_controller() { |
| 381 return window_selector_controller_.get(); | 378 return window_selector_controller_.get(); |
| 382 } | 379 } |
| 383 FocusCycler* focus_cycler() { return focus_cycler_.get(); } | 380 FocusCycler* focus_cycler() { return focus_cycler_.get(); } |
| (...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 764 | 761 |
| 765 // Injected content::GPUDataManager support. | 762 // Injected content::GPUDataManager support. |
| 766 scoped_ptr<GPUSupport> gpu_support_; | 763 scoped_ptr<GPUSupport> gpu_support_; |
| 767 | 764 |
| 768 DISALLOW_COPY_AND_ASSIGN(Shell); | 765 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 769 }; | 766 }; |
| 770 | 767 |
| 771 } // namespace ash | 768 } // namespace ash |
| 772 | 769 |
| 773 #endif // ASH_SHELL_H_ | 770 #endif // ASH_SHELL_H_ |
| OLD | NEW |