| 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 #include "ash/test/ash_test_base.h" | 5 #include "ash/test/ash_test_base.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 gesture_config->set_max_touch_move_in_pixels_for_click(5); | 144 gesture_config->set_max_touch_move_in_pixels_for_click(5); |
| 145 | 145 |
| 146 #if defined(OS_WIN) | 146 #if defined(OS_WIN) |
| 147 if (!command_line->HasSwitch(ash::switches::kForceAshToDesktop)) { | 147 if (!command_line->HasSwitch(ash::switches::kForceAshToDesktop)) { |
| 148 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { | 148 if (base::win::GetVersion() >= base::win::VERSION_WIN8) { |
| 149 ipc_thread_.reset(new base::Thread("test_metro_viewer_ipc_thread")); | 149 ipc_thread_.reset(new base::Thread("test_metro_viewer_ipc_thread")); |
| 150 base::Thread::Options options; | 150 base::Thread::Options options; |
| 151 options.message_loop_type = base::MessageLoop::TYPE_IO; | 151 options.message_loop_type = base::MessageLoop::TYPE_IO; |
| 152 ipc_thread_->StartWithOptions(options); | 152 ipc_thread_->StartWithOptions(options); |
| 153 metro_viewer_host_.reset( | 153 metro_viewer_host_.reset( |
| 154 new TestMetroViewerProcessHost(ipc_thread_->message_loop_proxy())); | 154 new TestMetroViewerProcessHost(ipc_thread_->task_runner())); |
| 155 CHECK(metro_viewer_host_->LaunchViewerAndWaitForConnection( | 155 CHECK(metro_viewer_host_->LaunchViewerAndWaitForConnection( |
| 156 win8::test::kDefaultTestAppUserModelId)); | 156 win8::test::kDefaultTestAppUserModelId)); |
| 157 aura::RemoteWindowTreeHostWin* window_tree_host = | 157 aura::RemoteWindowTreeHostWin* window_tree_host = |
| 158 aura::RemoteWindowTreeHostWin::Instance(); | 158 aura::RemoteWindowTreeHostWin::Instance(); |
| 159 CHECK(window_tree_host != NULL); | 159 CHECK(window_tree_host != NULL); |
| 160 } | 160 } |
| 161 ash::WindowPositioner::SetMaximizeFirstWindow(true); | 161 ash::WindowPositioner::SetMaximizeFirstWindow(true); |
| 162 } | 162 } |
| 163 #endif | 163 #endif |
| 164 } | 164 } |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 | 356 |
| 357 void AshTestBase::UnblockUserSession() { | 357 void AshTestBase::UnblockUserSession() { |
| 358 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); | 358 Shell::GetInstance()->session_state_delegate()->UnlockScreen(); |
| 359 SetSessionStarted(true); | 359 SetSessionStarted(true); |
| 360 SetUserAddingScreenRunning(false); | 360 SetUserAddingScreenRunning(false); |
| 361 } | 361 } |
| 362 | 362 |
| 363 | 363 |
| 364 } // namespace test | 364 } // namespace test |
| 365 } // namespace ash | 365 } // namespace ash |
| OLD | NEW |