| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" | 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 } else { | 354 } else { |
| 355 int next_x = 0; | 355 int next_x = 0; |
| 356 CreateRootWindowController("800x600", &next_x); | 356 CreateRootWindowController("800x600", &next_x); |
| 357 } | 357 } |
| 358 } | 358 } |
| 359 | 359 |
| 360 void AshTestHelper::CreateShell() { | 360 void AshTestHelper::CreateShell() { |
| 361 CHECK(config_ == Config::CLASSIC); | 361 CHECK(config_ == Config::CLASSIC); |
| 362 ui::ContextFactory* context_factory = nullptr; | 362 ui::ContextFactory* context_factory = nullptr; |
| 363 ui::ContextFactoryPrivate* context_factory_private = nullptr; | 363 ui::ContextFactoryPrivate* context_factory_private = nullptr; |
| 364 bool enable_pixel_output = false; | 364 bool enable_pixel_output = true; |
| 365 ui::InitializeContextFactoryForTests(enable_pixel_output, &context_factory, | 365 ui::InitializeContextFactoryForTests(enable_pixel_output, &context_factory, |
| 366 &context_factory_private); | 366 &context_factory_private); |
| 367 ShellInitParams init_params; | 367 ShellInitParams init_params; |
| 368 init_params.delegate = test_shell_delegate_; | 368 init_params.delegate = test_shell_delegate_; |
| 369 init_params.context_factory = context_factory; | 369 init_params.context_factory = context_factory; |
| 370 init_params.context_factory_private = context_factory_private; | 370 init_params.context_factory_private = context_factory_private; |
| 371 init_params.blocking_pool = ash_test_environment_->GetBlockingPool(); | 371 init_params.blocking_pool = ash_test_environment_->GetBlockingPool(); |
| 372 Shell::CreateInstance(init_params); | 372 Shell::CreateInstance(init_params); |
| 373 } | 373 } |
| 374 | 374 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 std::set<RootWindowController*> roots = | 412 std::set<RootWindowController*> roots = |
| 413 window_manager_app_->window_manager()->GetRootWindowControllers(); | 413 window_manager_app_->window_manager()->GetRootWindowControllers(); |
| 414 std::vector<RootWindowController*> ordered_roots; | 414 std::vector<RootWindowController*> ordered_roots; |
| 415 ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end()); | 415 ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end()); |
| 416 std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId); | 416 std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId); |
| 417 return ordered_roots; | 417 return ordered_roots; |
| 418 } | 418 } |
| 419 | 419 |
| 420 } // namespace test | 420 } // namespace test |
| 421 } // namespace ash | 421 } // namespace ash |
| OLD | NEW |