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

Side by Side Diff: chrome/browser/google/google_brand.cc

Issue 1502373009: Allow std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include. What. You. Use. Created 5 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/google/google_brand.h" 5 #include "chrome/browser/google/google_brand.h"
6 6
7 #include <algorithm>
7 #include <string> 8 #include <string>
8 9
9
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/installer/util/google_update_settings.h" 12 #include "chrome/installer/util/google_update_settings.h"
13 13
14 #if defined(OS_MACOSX) 14 #if defined(OS_MACOSX)
15 #include "chrome/browser/mac/keystone_glue.h" 15 #include "chrome/browser/mac/keystone_glue.h"
16 #elif defined(OS_CHROMEOS) 16 #elif defined(OS_CHROMEOS)
17 #include "chrome/browser/google/google_brand_chromeos.h" 17 #include "chrome/browser/google/google_brand_chromeos.h"
18 #endif 18 #endif
19 19
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 DCHECK(g_brand_for_testing == NULL); 137 DCHECK(g_brand_for_testing == NULL);
138 g_brand_for_testing = brand_.c_str(); 138 g_brand_for_testing = brand_.c_str();
139 } 139 }
140 140
141 BrandForTesting::~BrandForTesting() { 141 BrandForTesting::~BrandForTesting() {
142 g_brand_for_testing = NULL; 142 g_brand_for_testing = NULL;
143 } 143 }
144 144
145 145
146 } // namespace google_brand 146 } // namespace google_brand
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/log_private/filter_handler.cc ('k') | chrome/browser/spellchecker/spellcheck_host_metrics.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698