| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 } | 185 } |
| 186 PowerButtonController* power_button_controller() { | 186 PowerButtonController* power_button_controller() { |
| 187 return power_button_controller_.get(); | 187 return power_button_controller_.get(); |
| 188 } | 188 } |
| 189 VideoDetector* video_detector() { | 189 VideoDetector* video_detector() { |
| 190 return video_detector_.get(); | 190 return video_detector_.get(); |
| 191 } | 191 } |
| 192 WindowCycleController* window_cycle_controller() { | 192 WindowCycleController* window_cycle_controller() { |
| 193 return window_cycle_controller_.get(); | 193 return window_cycle_controller_.get(); |
| 194 } | 194 } |
| 195 internal::FocusCycler* focus_cycler() { |
| 196 return focus_cycler_.get(); |
| 197 } |
| 195 AudioController* audio_controller() const { | 198 AudioController* audio_controller() const { |
| 196 return audio_controller_; | 199 return audio_controller_; |
| 197 } | 200 } |
| 198 BrightnessController* brightness_controller() const { | 201 BrightnessController* brightness_controller() const { |
| 199 return brightness_controller_; | 202 return brightness_controller_; |
| 200 } | 203 } |
| 201 PowerStatusController* power_status_controller() const { | 204 PowerStatusController* power_status_controller() const { |
| 202 return power_status_controller_; | 205 return power_status_controller_; |
| 203 } | 206 } |
| 204 | 207 |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 // Offset between the corner of the status area and the corner of the screen | 328 // Offset between the corner of the status area and the corner of the screen |
| 326 // when in the compact window mode. | 329 // when in the compact window mode. |
| 327 gfx::Size compact_status_area_offset_; | 330 gfx::Size compact_status_area_offset_; |
| 328 | 331 |
| 329 DISALLOW_COPY_AND_ASSIGN(Shell); | 332 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 330 }; | 333 }; |
| 331 | 334 |
| 332 } // namespace ash | 335 } // namespace ash |
| 333 | 336 |
| 334 #endif // ASH_SHELL_H_ | 337 #endif // ASH_SHELL_H_ |
| OLD | NEW |