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