diff options
| author | davidben <davidben@chromium.org> | 2016-01-21 17:41:41 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-22 01:43:27 +0000 |
| commit | 411d3f7a3a18335713a46d9022ce25e018a19e47 (patch) | |
| tree | 72cd74ea04f27cc8b01f7153f43e24ae8d48b512 /ash | |
| parent | 58be7eea6963f63c4395e97a8a8099916f738a61 (diff) | |
| download | chromium_src-411d3f7a3a18335713a46d9022ce25e018a19e47.zip chromium_src-411d3f7a3a18335713a46d9022ce25e018a19e47.tar.gz chromium_src-411d3f7a3a18335713a46d9022ce25e018a19e47.tar.bz2 | |
Allow std::unordered_*.
This is a reland of https://codereview.chromium.org/1502373009 with some fixes
for components/metrics/leak_detector allocator type mismatches.
Original issue's description:
> Allow std::unordered_*.
>
> base::hash_* is, as a transition step, implemented in terms of
> std::unordered_*. Later commits will convert existing uses.
>
> Also fix a host of IWYU problems that arose from this CL.
>
> (NOPRESUBMIT because the wstring presubmit check is overzealous
> and complains about the reference to wstring in the comment.)
>
> Committed: https://crrev.com/3f37f7f1459e7b5a452c0e433493e0a6e9649ca7
> Cr-Commit-Position: refs/heads/master@{#370553}
BUG=576864
TBR=derat@chromium.org,danakj@chromium.org,dalecurtis@chromium.org,jbauman@chromium.org,blundell@chromium.org
NOPRESUBMIT=true
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1615713003
Cr-Commit-Position: refs/heads/master@{#370867}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/display/display_info.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ash/display/display_info.cc b/ash/display/display_info.cc index b89d4d5..a85d175 100644 --- a/ash/display/display_info.cc +++ b/ash/display/display_info.cc @@ -2,11 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ash/display/display_info.h" + #include <stdio.h> + +#include <algorithm> #include <string> #include <vector> -#include "ash/display/display_info.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" |