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

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

Issue 76583003: Rename RootWindowHost* to WindowTreeHost* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years 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_controller.cc ('k') | ash/display/mirror_window_controller.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 <stdio.h> 5 #include <stdio.h>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/display/display_info.h" 9 #include "ash/display/display_info.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 27 matching lines...) Expand all
38 // Default bounds for a display. 38 // Default bounds for a display.
39 const int kDefaultHostWindowX = 200; 39 const int kDefaultHostWindowX = 200;
40 const int kDefaultHostWindowY = 200; 40 const int kDefaultHostWindowY = 200;
41 const int kDefaultHostWindowWidth = 1366; 41 const int kDefaultHostWindowWidth = 1366;
42 const int kDefaultHostWindowHeight = 768; 42 const int kDefaultHostWindowHeight = 768;
43 43
44 // Use larger than max int to catch overflow early. 44 // Use larger than max int to catch overflow early.
45 static int64 synthesized_display_id = 2200000000LL; 45 static int64 synthesized_display_id = 2200000000LL;
46 46
47 #if defined(OS_WIN) 47 #if defined(OS_WIN)
48 gfx::Rect bounds_in_native(aura::RootWindowHost::GetNativeScreenSize()); 48 gfx::Rect bounds_in_native(aura::WindowTreeHost::GetNativeScreenSize());
49 #else 49 #else
50 gfx::Rect bounds_in_native(kDefaultHostWindowX, kDefaultHostWindowY, 50 gfx::Rect bounds_in_native(kDefaultHostWindowX, kDefaultHostWindowY,
51 kDefaultHostWindowWidth, kDefaultHostWindowHeight); 51 kDefaultHostWindowWidth, kDefaultHostWindowHeight);
52 #endif 52 #endif
53 std::string main_spec = spec; 53 std::string main_spec = spec;
54 54
55 float ui_scale = 1.0f; 55 float ui_scale = 1.0f;
56 std::vector<std::string> parts; 56 std::vector<std::string> parts;
57 if (Tokenize(main_spec, "@", &parts) == 2) { 57 if (Tokenize(main_spec, "@", &parts) == 2) {
58 double scale_in_double = 0; 58 double scale_in_double = 0;
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 resolutions_str += ","; 255 resolutions_str += ",";
256 resolutions_str += iter->size.ToString(); 256 resolutions_str += iter->size.ToString();
257 if (iter->interlaced) 257 if (iter->interlaced)
258 resolutions_str += "(i)"; 258 resolutions_str += "(i)";
259 } 259 }
260 return ToString() + ", resolutions=" + resolutions_str; 260 return ToString() + ", resolutions=" + resolutions_str;
261 } 261 }
262 262
263 } // namespace internal 263 } // namespace internal
264 } // namespace ash 264 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_controller.cc ('k') | ash/display/mirror_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698