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 #include "ash/test/ash_test_helper.h" | 5 #include "ash/test/ash_test_helper.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_controller_delegate_aura.h" | 7 #include "ash/accelerators/accelerator_controller_delegate_aura.h" |
8 #include "ash/common/material_design/material_design_controller.h" | 8 #include "ash/common/material_design/material_design_controller.h" |
9 #include "ash/common/test/material_design_controller_test_api.h" | 9 #include "ash/common/test/material_design_controller_test_api.h" |
10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "ui/base/test/material_design_controller_test_api.h" | 28 #include "ui/base/test/material_design_controller_test_api.h" |
29 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 29 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
30 #include "ui/compositor/test/context_factories_for_test.h" | 30 #include "ui/compositor/test/context_factories_for_test.h" |
31 #include "ui/display/manager/managed_display_info.h" | 31 #include "ui/display/manager/managed_display_info.h" |
32 #include "ui/message_center/message_center.h" | 32 #include "ui/message_center/message_center.h" |
33 #include "ui/wm/core/capture_controller.h" | 33 #include "ui/wm/core/capture_controller.h" |
34 #include "ui/wm/core/cursor_manager.h" | 34 #include "ui/wm/core/cursor_manager.h" |
35 | 35 |
36 #if defined(OS_CHROMEOS) | 36 #if defined(OS_CHROMEOS) |
37 #include "chromeos/audio/cras_audio_handler.h" | 37 #include "chromeos/audio/cras_audio_handler.h" |
38 #include "chromeos/dbus/dbus_client_types.h" | |
39 #include "chromeos/dbus/dbus_thread_manager.h" | 38 #include "chromeos/dbus/dbus_thread_manager.h" |
40 #include "device/bluetooth/bluetooth_adapter_factory.h" | 39 #include "device/bluetooth/bluetooth_adapter_factory.h" |
41 #include "device/bluetooth/dbus/bluez_dbus_manager.h" | 40 #include "device/bluetooth/dbus/bluez_dbus_manager.h" |
42 #endif | 41 #endif |
43 | 42 |
44 #if defined(OS_WIN) | 43 #if defined(OS_WIN) |
45 #include "base/win/windows_version.h" | 44 #include "base/win/windows_version.h" |
46 #endif | 45 #endif |
47 | 46 |
48 #if defined(USE_X11) | 47 #if defined(USE_X11) |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 // Create DBusThreadManager for testing. | 93 // Create DBusThreadManager for testing. |
95 if (!chromeos::DBusThreadManager::IsInitialized()) { | 94 if (!chromeos::DBusThreadManager::IsInitialized()) { |
96 chromeos::DBusThreadManager::Initialize( | 95 chromeos::DBusThreadManager::Initialize( |
97 chromeos::DBusThreadManager::PROCESS_ASH); | 96 chromeos::DBusThreadManager::PROCESS_ASH); |
98 dbus_thread_manager_initialized_ = true; | 97 dbus_thread_manager_initialized_ = true; |
99 } | 98 } |
100 | 99 |
101 if (!bluez::BluezDBusManager::IsInitialized()) { | 100 if (!bluez::BluezDBusManager::IsInitialized()) { |
102 bluez::BluezDBusManager::Initialize( | 101 bluez::BluezDBusManager::Initialize( |
103 chromeos::DBusThreadManager::Get()->GetSystemBus(), | 102 chromeos::DBusThreadManager::Get()->GetSystemBus(), |
104 chromeos::DBusThreadManager::Get()->IsUsingFake( | 103 chromeos::DBusThreadManager::Get()->IsUsingFakes()); |
105 chromeos::DBusClientType::BLUETOOTH)); | |
106 bluez_dbus_manager_initialized_ = true; | 104 bluez_dbus_manager_initialized_ = true; |
107 } | 105 } |
108 | 106 |
109 // Create CrasAudioHandler for testing since g_browser_process is not | 107 // Create CrasAudioHandler for testing since g_browser_process is not |
110 // created in AshTestBase tests. | 108 // created in AshTestBase tests. |
111 chromeos::CrasAudioHandler::InitializeForTesting(); | 109 chromeos::CrasAudioHandler::InitializeForTesting(); |
112 #endif | 110 #endif |
113 ash_test_environment_->SetUp(); | 111 ash_test_environment_->SetUp(); |
114 // Reset the global state for the cursor manager. This includes the | 112 // Reset the global state for the cursor manager. This includes the |
115 // last cursor visibility state, etc. | 113 // last cursor visibility state, etc. |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 bool AshTestHelper::SupportsHostWindowResize() { | 217 bool AshTestHelper::SupportsHostWindowResize() { |
220 #if defined(OS_WIN) | 218 #if defined(OS_WIN) |
221 return false; | 219 return false; |
222 #else | 220 #else |
223 return true; | 221 return true; |
224 #endif | 222 #endif |
225 } | 223 } |
226 | 224 |
227 } // namespace test | 225 } // namespace test |
228 } // namespace ash | 226 } // namespace ash |
OLD | NEW |