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

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

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « ash/test/ash_test_helper_unittest.cc ('k') | ash/test/ui_controls_factory_ash.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 <vector> 7 #include <vector>
8 8
9 #include "ash/display/display_info.h" 9 #include "ash/display/display_info.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "base/strings/string_split.h" 12 #include "base/strings/string_split.h"
13 #include "ui/aura/root_window.h" 13 #include "ui/aura/window_event_dispatcher.h"
14 #include "ui/gfx/display.h" 14 #include "ui/gfx/display.h"
15 15
16 namespace ash { 16 namespace ash {
17 namespace test { 17 namespace test {
18 typedef std::vector<gfx::Display> DisplayList; 18 typedef std::vector<gfx::Display> DisplayList;
19 typedef internal::DisplayInfo DisplayInfo; 19 typedef internal::DisplayInfo DisplayInfo;
20 typedef std::vector<DisplayInfo> DisplayInfoList; 20 typedef std::vector<DisplayInfo> DisplayInfoList;
21 21
22 namespace { 22 namespace {
23 23
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 gfx::Display::SetInternalDisplayId(internal.id()); 87 gfx::Display::SetInternalDisplayId(internal.id());
88 return gfx::Display::InternalDisplayId(); 88 return gfx::Display::InternalDisplayId();
89 } 89 }
90 90
91 void DisplayManagerTestApi::DisableChangeDisplayUponHostResize() { 91 void DisplayManagerTestApi::DisableChangeDisplayUponHostResize() {
92 display_manager_->set_change_display_upon_host_resize(false); 92 display_manager_->set_change_display_upon_host_resize(false);
93 } 93 }
94 94
95 } // namespace test 95 } // namespace test
96 } // namespace ash 96 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_helper_unittest.cc ('k') | ash/test/ui_controls_factory_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698