| 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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 return window_cycle_controller_.get(); | 373 return window_cycle_controller_.get(); |
| 374 } | 374 } |
| 375 WindowSelectorController* window_selector_controller() { | 375 WindowSelectorController* window_selector_controller() { |
| 376 return window_selector_controller_.get(); | 376 return window_selector_controller_.get(); |
| 377 } | 377 } |
| 378 FocusCycler* focus_cycler() { return focus_cycler_.get(); } | 378 FocusCycler* focus_cycler() { return focus_cycler_.get(); } |
| 379 DisplayController* display_controller() { | 379 DisplayController* display_controller() { |
| 380 return display_controller_.get(); | 380 return display_controller_.get(); |
| 381 } | 381 } |
| 382 #if defined(OS_CHROMEOS) | 382 #if defined(OS_CHROMEOS) |
| 383 PowerEventObserver* power_event_observer() { |
| 384 return power_event_observer_.get(); |
| 385 } |
| 383 TouchTransformerController* touch_transformer_controller() { | 386 TouchTransformerController* touch_transformer_controller() { |
| 384 return touch_transformer_controller_.get(); | 387 return touch_transformer_controller_.get(); |
| 385 } | 388 } |
| 386 #endif // defined(OS_CHROMEOS) | 389 #endif // defined(OS_CHROMEOS) |
| 387 MouseCursorEventFilter* mouse_cursor_filter() { | 390 MouseCursorEventFilter* mouse_cursor_filter() { |
| 388 return mouse_cursor_filter_.get(); | 391 return mouse_cursor_filter_.get(); |
| 389 } | 392 } |
| 390 EventTransformationHandler* event_transformation_handler() { | 393 EventTransformationHandler* event_transformation_handler() { |
| 391 return event_transformation_handler_.get(); | 394 return event_transformation_handler_.get(); |
| 392 } | 395 } |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 756 | 759 |
| 757 // Injected content::GPUDataManager support. | 760 // Injected content::GPUDataManager support. |
| 758 scoped_ptr<GPUSupport> gpu_support_; | 761 scoped_ptr<GPUSupport> gpu_support_; |
| 759 | 762 |
| 760 DISALLOW_COPY_AND_ASSIGN(Shell); | 763 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 761 }; | 764 }; |
| 762 | 765 |
| 763 } // namespace ash | 766 } // namespace ash |
| 764 | 767 |
| 765 #endif // ASH_SHELL_H_ | 768 #endif // ASH_SHELL_H_ |
| OLD | NEW |