OLD | NEW |
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 "ui/gfx/display.h" | 5 #include "ui/gfx/display.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
13 #include "ui/gfx/insets.h" | 13 #include "ui/gfx/insets.h" |
14 #include "ui/gfx/point_conversions.h" | 14 #include "ui/gfx/point_conversions.h" |
15 #include "ui/gfx/point_f.h" | 15 #include "ui/gfx/point_f.h" |
16 #include "ui/gfx/size_conversions.h" | 16 #include "ui/gfx/size_conversions.h" |
17 #include "ui/gfx/switches.h" | 17 #include "ui/gfx/switches.h" |
18 | 18 |
19 namespace gfx { | 19 namespace gfx { |
20 namespace { | 20 namespace { |
21 | 21 |
22 bool HasForceDeviceScaleFactorImpl() { | 22 bool HasForceDeviceScaleFactorImpl() { |
23 return CommandLine::ForCurrentProcess()->HasSwitch( | 23 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
24 switches::kForceDeviceScaleFactor); | 24 switches::kForceDeviceScaleFactor); |
25 } | 25 } |
26 | 26 |
27 float GetForcedDeviceScaleFactorImpl() { | 27 float GetForcedDeviceScaleFactorImpl() { |
28 double scale_in_double = 1.0; | 28 double scale_in_double = 1.0; |
29 if (HasForceDeviceScaleFactorImpl()) { | 29 if (HasForceDeviceScaleFactorImpl()) { |
30 std::string value = CommandLine::ForCurrentProcess()-> | 30 std::string value = |
31 GetSwitchValueASCII(switches::kForceDeviceScaleFactor); | 31 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
| 32 switches::kForceDeviceScaleFactor); |
32 if (!base::StringToDouble(value, &scale_in_double)) | 33 if (!base::StringToDouble(value, &scale_in_double)) |
33 LOG(ERROR) << "Failed to parse the default device scale factor:" << value; | 34 LOG(ERROR) << "Failed to parse the default device scale factor:" << value; |
34 } | 35 } |
35 return static_cast<float>(scale_in_double); | 36 return static_cast<float>(scale_in_double); |
36 } | 37 } |
37 | 38 |
38 int64 internal_display_id_ = -1; | 39 int64 internal_display_id_ = -1; |
39 | 40 |
40 } // namespace | 41 } // namespace |
41 | 42 |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 | 184 |
184 int64 Display::InternalDisplayId() { | 185 int64 Display::InternalDisplayId() { |
185 return internal_display_id_; | 186 return internal_display_id_; |
186 } | 187 } |
187 | 188 |
188 void Display::SetInternalDisplayId(int64 internal_display_id) { | 189 void Display::SetInternalDisplayId(int64 internal_display_id) { |
189 internal_display_id_ = internal_display_id; | 190 internal_display_id_ = internal_display_id; |
190 } | 191 } |
191 | 192 |
192 } // namespace gfx | 193 } // namespace gfx |
OLD | NEW |