Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: ash/test/ash_test_helper.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/test/ash_test_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/test/test_session_state_delegate.h"
9 #include "ash/common/test/test_system_tray_delegate.h"
10 #include "ash/common/test/wm_shell_test_api.h"
11 #include "ash/common/wm_shell.h"
12 #include "ash/common/wm_window.h"
13 #include "ash/mus/screen_mus.h" 8 #include "ash/mus/screen_mus.h"
14 #include "ash/mus/window_manager.h" 9 #include "ash/mus/window_manager.h"
15 #include "ash/mus/window_manager_application.h" 10 #include "ash/mus/window_manager_application.h"
16 #include "ash/shell.h" 11 #include "ash/shell.h"
17 #include "ash/shell_init_params.h" 12 #include "ash/shell_init_params.h"
18 #include "ash/system/screen_layout_observer.h" 13 #include "ash/system/screen_layout_observer.h"
19 #include "ash/test/ash_test_environment.h" 14 #include "ash/test/ash_test_environment.h"
20 #include "ash/test/ash_test_views_delegate.h" 15 #include "ash/test/ash_test_views_delegate.h"
21 #include "ash/test/shell_test_api.h" 16 #include "ash/test/shell_test_api.h"
22 #include "ash/test/test_screenshot_delegate.h" 17 #include "ash/test/test_screenshot_delegate.h"
18 #include "ash/test/test_session_state_delegate.h"
23 #include "ash/test/test_shell_delegate.h" 19 #include "ash/test/test_shell_delegate.h"
20 #include "ash/test/test_system_tray_delegate.h"
21 #include "ash/test/wm_shell_test_api.h"
22 #include "ash/wm_shell.h"
23 #include "ash/wm_window.h"
24 #include "base/memory/ptr_util.h" 24 #include "base/memory/ptr_util.h"
25 #include "base/run_loop.h" 25 #include "base/run_loop.h"
26 #include "base/strings/string_split.h" 26 #include "base/strings/string_split.h"
27 #include "base/test/sequenced_worker_pool_owner.h" 27 #include "base/test/sequenced_worker_pool_owner.h"
28 #include "chromeos/audio/cras_audio_handler.h" 28 #include "chromeos/audio/cras_audio_handler.h"
29 #include "chromeos/dbus/dbus_thread_manager.h" 29 #include "chromeos/dbus/dbus_thread_manager.h"
30 #include "device/bluetooth/bluetooth_adapter_factory.h" 30 #include "device/bluetooth/bluetooth_adapter_factory.h"
31 #include "device/bluetooth/dbus/bluez_dbus_manager.h" 31 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
32 #include "ui/aura/env.h" 32 #include "ui/aura/env.h"
33 #include "ui/aura/input_state_lookup.h" 33 #include "ui/aura/input_state_lookup.h"
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 std::set<RootWindowController*> roots = 364 std::set<RootWindowController*> roots =
365 window_manager_app_->window_manager()->GetRootWindowControllers(); 365 window_manager_app_->window_manager()->GetRootWindowControllers();
366 std::vector<RootWindowController*> ordered_roots; 366 std::vector<RootWindowController*> ordered_roots;
367 ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end()); 367 ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end());
368 std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId); 368 std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId);
369 return ordered_roots; 369 return ordered_roots;
370 } 370 }
371 371
372 } // namespace test 372 } // namespace test
373 } // namespace ash 373 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/test/ash_test_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698