| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_TEST_ASH_TEST_HELPER_H_ | 5 #ifndef ASH_TEST_ASH_TEST_HELPER_H_ |
| 6 #define ASH_TEST_ASH_TEST_HELPER_H_ | 6 #define ASH_TEST_ASH_TEST_HELPER_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" | 11 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | |
| 11 | 12 |
| 12 namespace aura { | 13 namespace aura { |
| 13 class Window; | 14 class Window; |
| 14 } // namespace aura | 15 } // namespace aura |
| 15 | 16 |
| 16 namespace base { | 17 namespace base { |
| 17 class MessageLoopForUI; | 18 class MessageLoopForUI; |
| 18 } // namespace base | 19 } // namespace base |
| 19 | 20 |
| 20 namespace ui { | 21 namespace ui { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 // or false otherwise (e.g. win8 bot). | 78 // or false otherwise (e.g. win8 bot). |
| 78 static bool SupportsMultipleDisplays(); | 79 static bool SupportsMultipleDisplays(); |
| 79 | 80 |
| 80 // True if the running environment supports host window resize, | 81 // True if the running environment supports host window resize, |
| 81 // or false otherwise (e.g. win8 bot). | 82 // or false otherwise (e.g. win8 bot). |
| 82 static bool SupportsHostWindowResize(); | 83 static bool SupportsHostWindowResize(); |
| 83 | 84 |
| 84 private: | 85 private: |
| 85 base::MessageLoopForUI* message_loop_; // Not owned. | 86 base::MessageLoopForUI* message_loop_; // Not owned. |
| 86 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell. | 87 TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell. |
| 87 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; | 88 std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; |
| 88 | 89 |
| 89 // Owned by ash::AcceleratorController | 90 // Owned by ash::AcceleratorController |
| 90 TestScreenshotDelegate* test_screenshot_delegate_; | 91 TestScreenshotDelegate* test_screenshot_delegate_; |
| 91 | 92 |
| 92 scoped_ptr<views::ViewsDelegate> views_delegate_; | 93 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
| 93 | 94 |
| 94 // An implementation of ShellContentState supplied by the user prior to | 95 // An implementation of ShellContentState supplied by the user prior to |
| 95 // SetUp(). | 96 // SetUp(). |
| 96 ShellContentState* content_state_; | 97 ShellContentState* content_state_; |
| 97 // If |content_state_| is not set prior to SetUp(), this value will be | 98 // If |content_state_| is not set prior to SetUp(), this value will be |
| 98 // set to an instance of TestShellContentState created by this class. If | 99 // set to an instance of TestShellContentState created by this class. If |
| 99 // |content_state_| is non-null, this will be nullptr. | 100 // |content_state_| is non-null, this will be nullptr. |
| 100 TestShellContentState* test_shell_content_state_; | 101 TestShellContentState* test_shell_content_state_; |
| 101 | 102 |
| 102 #if defined(OS_CHROMEOS) | 103 #if defined(OS_CHROMEOS) |
| 103 // Check if DBus Thread Manager was initialized here. | 104 // Check if DBus Thread Manager was initialized here. |
| 104 bool dbus_thread_manager_initialized_; | 105 bool dbus_thread_manager_initialized_; |
| 105 // Check if Bluez DBus Manager was initialized here. | 106 // Check if Bluez DBus Manager was initialized here. |
| 106 bool bluez_dbus_manager_initialized_; | 107 bool bluez_dbus_manager_initialized_; |
| 107 #endif | 108 #endif |
| 108 | 109 |
| 109 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); | 110 DISALLOW_COPY_AND_ASSIGN(AshTestHelper); |
| 110 }; | 111 }; |
| 111 | 112 |
| 112 } // namespace test | 113 } // namespace test |
| 113 } // namespace ash | 114 } // namespace ash |
| 114 | 115 |
| 115 #endif // ASH_TEST_ASH_TEST_HELPER_H_ | 116 #endif // ASH_TEST_ASH_TEST_HELPER_H_ |
| OLD | NEW |