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

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

Issue 1502373009: Allow std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, more HashPair -> HashInts Created 4 years, 11 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
« no previous file with comments | « no previous file | base/containers/hash_tables.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 "ash/display/display_info.h"
6
5 #include <stdio.h> 7 #include <stdio.h>
8
9 #include <algorithm>
6 #include <string> 10 #include <string>
7 #include <vector> 11 #include <vector>
8 12
9 #include "ash/display/display_info.h"
10 #include "base/logging.h" 13 #include "base/logging.h"
11 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
13 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
14 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
15 #include "ui/gfx/display.h" 18 #include "ui/gfx/display.h"
16 #include "ui/gfx/geometry/size_conversions.h" 19 #include "ui/gfx/geometry/size_conversions.h"
17 #include "ui/gfx/geometry/size_f.h" 20 #include "ui/gfx/geometry/size_f.h"
18 21
19 #if defined(OS_WIN) 22 #if defined(OS_WIN)
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 449
447 void DisplayInfo::ClearInputDevices() { 450 void DisplayInfo::ClearInputDevices() {
448 input_devices_.clear(); 451 input_devices_.clear();
449 } 452 }
450 453
451 void ResetDisplayIdForTest() { 454 void ResetDisplayIdForTest() {
452 synthesized_display_id = kSynthesizedDisplayIdStart; 455 synthesized_display_id = kSynthesizedDisplayIdStart;
453 } 456 }
454 457
455 } // namespace ash 458 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | base/containers/hash_tables.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698