| 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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 } | 407 } |
| 408 ScreenshotController* screenshot_controller() { | 408 ScreenshotController* screenshot_controller() { |
| 409 return screenshot_controller_.get(); | 409 return screenshot_controller_.get(); |
| 410 } | 410 } |
| 411 MouseCursorEventFilter* mouse_cursor_filter() { | 411 MouseCursorEventFilter* mouse_cursor_filter() { |
| 412 return mouse_cursor_filter_.get(); | 412 return mouse_cursor_filter_.get(); |
| 413 } | 413 } |
| 414 EventTransformationHandler* event_transformation_handler() { | 414 EventTransformationHandler* event_transformation_handler() { |
| 415 return event_transformation_handler_.get(); | 415 return event_transformation_handler_.get(); |
| 416 } | 416 } |
| 417 AshNativeCursorManager* native_cursor_manager() { |
| 418 return native_cursor_manager_; |
| 419 } |
| 417 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); } | 420 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); } |
| 418 | 421 |
| 419 SessionStateDelegate* session_state_delegate() { | 422 SessionStateDelegate* session_state_delegate() { |
| 420 return session_state_delegate_.get(); | 423 return session_state_delegate_.get(); |
| 421 } | 424 } |
| 422 | 425 |
| 423 HighContrastController* high_contrast_controller() { | 426 HighContrastController* high_contrast_controller() { |
| 424 return high_contrast_controller_.get(); | 427 return high_contrast_controller_.get(); |
| 425 } | 428 } |
| 426 | 429 |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 834 base::ObserverList<ShellObserver> shell_observers_; | 837 base::ObserverList<ShellObserver> shell_observers_; |
| 835 | 838 |
| 836 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 839 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 837 | 840 |
| 838 DISALLOW_COPY_AND_ASSIGN(Shell); | 841 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 839 }; | 842 }; |
| 840 | 843 |
| 841 } // namespace ash | 844 } // namespace ash |
| 842 | 845 |
| 843 #endif // ASH_SHELL_H_ | 846 #endif // ASH_SHELL_H_ |
| OLD | NEW |