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

Side by Side Diff: ash/display/display_manager.cc

Issue 192483007: Move chromeos/display/* to ui/display/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include display.gyp into ChromeOS builds only Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/display/display_manager.h ('k') | ash/display/event_transformation_handler.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/display/display_manager.h" 5 #include "ash/display/display_manager.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 17 matching lines...) Expand all
28 #include "ui/gfx/screen.h" 28 #include "ui/gfx/screen.h"
29 #include "ui/gfx/size_conversions.h" 29 #include "ui/gfx/size_conversions.h"
30 30
31 #if defined(USE_X11) 31 #if defined(USE_X11)
32 #include "ui/base/x/x11_util.h" 32 #include "ui/base/x/x11_util.h"
33 #endif 33 #endif
34 34
35 #if defined(OS_CHROMEOS) 35 #if defined(OS_CHROMEOS)
36 #include "ash/display/output_configurator_animation.h" 36 #include "ash/display/output_configurator_animation.h"
37 #include "base/sys_info.h" 37 #include "base/sys_info.h"
38 #include "chromeos/display/output_configurator.h"
39 #endif 38 #endif
40 39
41 #if defined(OS_WIN) 40 #if defined(OS_WIN)
42 #include "base/win/windows_version.h" 41 #include "base/win/windows_version.h"
43 #endif 42 #endif
44 43
45 namespace ash { 44 namespace ash {
46 namespace internal { 45 namespace internal {
47 typedef std::vector<gfx::Display> DisplayList; 46 typedef std::vector<gfx::Display> DisplayList;
48 typedef std::vector<DisplayInfo> DisplayInfoList; 47 typedef std::vector<DisplayInfo> DisplayInfoList;
(...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 break; 1075 break;
1077 } 1076 }
1078 gfx::Insets insets = secondary_display->GetWorkAreaInsets(); 1077 gfx::Insets insets = secondary_display->GetWorkAreaInsets();
1079 secondary_display->set_bounds( 1078 secondary_display->set_bounds(
1080 gfx::Rect(new_secondary_origin, secondary_bounds.size())); 1079 gfx::Rect(new_secondary_origin, secondary_bounds.size()));
1081 secondary_display->UpdateWorkAreaFromInsets(insets); 1080 secondary_display->UpdateWorkAreaFromInsets(insets);
1082 } 1081 }
1083 1082
1084 } // namespace internal 1083 } // namespace internal
1085 } // namespace ash 1084 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_manager.h ('k') | ash/display/event_transformation_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698