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

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

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 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_helper.cc ('k') | ash/test/test_suite.cc » ('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 (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/display_manager_test_api.h" 5 #include "ash/test/display_manager_test_api.h"
6 6
7 #include <cstdarg> 7 #include <cstdarg>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/ash_switches.h"
11 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
12 #include "ash/display/extended_mouse_warp_controller.h" 11 #include "ash/display/extended_mouse_warp_controller.h"
13 #include "ash/display/mouse_cursor_event_filter.h" 12 #include "ash/display/mouse_cursor_event_filter.h"
14 #include "ash/display/unified_mouse_warp_controller.h" 13 #include "ash/display/unified_mouse_warp_controller.h"
15 #include "ash/screen_util.h" 14 #include "ash/screen_util.h"
16 #include "ash/shell.h" 15 #include "ash/shell.h"
17 #include "base/command_line.h" 16 #include "base/command_line.h"
18 #include "base/strings/string_split.h" 17 #include "base/strings/string_split.h"
19 #include "ui/aura/env.h" 18 #include "ui/aura/env.h"
20 #include "ui/aura/window_event_dispatcher.h" 19 #include "ui/aura/window_event_dispatcher.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 for (size_t i = 0; i < count; i++) { 197 for (size_t i = 0; i < count; i++) {
199 int64_t id = va_arg(args, int64_t); 198 int64_t id = va_arg(args, int64_t);
200 list.push_back(id); 199 list.push_back(id);
201 } 200 }
202 display::SortDisplayIdList(&list); 201 display::SortDisplayIdList(&list);
203 return list; 202 return list;
204 } 203 }
205 204
206 } // namespace test 205 } // namespace test
207 } // namespace ash 206 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | ash/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698