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

Side by Side Diff: ui/gfx/display.cc

Issue 23851026: add missing #includes of <algorithm>, needed on VS2013 for std::min/max (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | « ui/gfx/box_f.cc ('k') | ui/gfx/quad_f.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) 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>
8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/logging.h" 10 #include "base/logging.h"
9 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
11 #include "ui/base/ui_base_switches.h" 13 #include "ui/base/ui_base_switches.h"
12 #include "ui/gfx/insets.h" 14 #include "ui/gfx/insets.h"
13 #include "ui/gfx/point_conversions.h" 15 #include "ui/gfx/point_conversions.h"
14 #include "ui/gfx/point_f.h" 16 #include "ui/gfx/point_f.h"
15 #include "ui/gfx/size_conversions.h" 17 #include "ui/gfx/size_conversions.h"
16 18
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 143
142 int64 Display::InternalDisplayId() { 144 int64 Display::InternalDisplayId() {
143 return internal_display_id_; 145 return internal_display_id_;
144 } 146 }
145 147
146 void Display::SetInternalDisplayId(int64 internal_display_id) { 148 void Display::SetInternalDisplayId(int64 internal_display_id) {
147 internal_display_id_ = internal_display_id; 149 internal_display_id_ = internal_display_id;
148 } 150 }
149 151
150 } // namespace gfx 152 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/box_f.cc ('k') | ui/gfx/quad_f.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698