| 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" | |
| 18 | 17 |
| 19 namespace gfx { | 18 namespace gfx { |
| 20 namespace { | 19 namespace { |
| 21 | 20 |
| 22 int64 internal_display_id_ = -1; | 21 int64 internal_display_id_ = -1; |
| 23 | 22 |
| 24 } // namespace | 23 } // namespace |
| 25 | 24 |
| 26 const int64 Display::kInvalidDisplayID = -1; | 25 const int64 Display::kInvalidDisplayID = -1; |
| 27 | 26 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 | 159 |
| 161 int64 Display::InternalDisplayId() { | 160 int64 Display::InternalDisplayId() { |
| 162 return internal_display_id_; | 161 return internal_display_id_; |
| 163 } | 162 } |
| 164 | 163 |
| 165 void Display::SetInternalDisplayId(int64 internal_display_id) { | 164 void Display::SetInternalDisplayId(int64 internal_display_id) { |
| 166 internal_display_id_ = internal_display_id; | 165 internal_display_id_ = internal_display_id; |
| 167 } | 166 } |
| 168 | 167 |
| 169 } // namespace gfx | 168 } // namespace gfx |
| OLD | NEW |