| 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 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 // Creates instance of FirstRunHelper. Caller is responsible for deleting | 536 // Creates instance of FirstRunHelper. Caller is responsible for deleting |
| 537 // returned object. | 537 // returned object. |
| 538 ash::FirstRunHelper* CreateFirstRunHelper(); | 538 ash::FirstRunHelper* CreateFirstRunHelper(); |
| 539 | 539 |
| 540 StickyKeysController* sticky_keys_controller() { | 540 StickyKeysController* sticky_keys_controller() { |
| 541 return sticky_keys_controller_.get(); | 541 return sticky_keys_controller_.get(); |
| 542 } | 542 } |
| 543 #endif // defined(OS_CHROMEOS) | 543 #endif // defined(OS_CHROMEOS) |
| 544 | 544 |
| 545 GPUSupport* gpu_support() { return gpu_support_.get(); } | 545 GPUSupport* gpu_support() { return gpu_support_.get(); } |
| 546 void SetGPUSupport(scoped_ptr<GPUSupport> gpu_support); | |
| 547 | 546 |
| 548 private: | 547 private: |
| 549 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); | 548 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); |
| 550 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); | 549 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); |
| 551 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); | 550 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); |
| 552 friend class internal::RootWindowController; | 551 friend class internal::RootWindowController; |
| 553 friend class internal::ScopedTargetRootWindow; | 552 friend class internal::ScopedTargetRootWindow; |
| 554 friend class test::ShellTestApi; | 553 friend class test::ShellTestApi; |
| 555 friend class shell::WindowWatcher; | 554 friend class shell::WindowWatcher; |
| 556 | 555 |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 | 715 |
| 717 // Injected content::GPUDataManager support. | 716 // Injected content::GPUDataManager support. |
| 718 scoped_ptr<GPUSupport> gpu_support_; | 717 scoped_ptr<GPUSupport> gpu_support_; |
| 719 | 718 |
| 720 DISALLOW_COPY_AND_ASSIGN(Shell); | 719 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 721 }; | 720 }; |
| 722 | 721 |
| 723 } // namespace ash | 722 } // namespace ash |
| 724 | 723 |
| 725 #endif // ASH_SHELL_H_ | 724 #endif // ASH_SHELL_H_ |
| OLD | NEW |