chrome/browser/google/google_brand.cc - Issue 1610023003: Revert of Allow std::unordered_*.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1610023003: Revert of Allow std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

OLD	NEW
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>

8 #include <string>	7 #include <string>

9	8

10 #include "base/macros.h"	9 #include "base/macros.h"

11 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

12 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

13 #include "build/build_config.h"	12 #include "build/build_config.h"

14 #include "chrome/installer/util/google_update_settings.h"	13 #include "chrome/installer/util/google_update_settings.h"

15	14

16 #if defined(OS_MACOSX)	15 #if defined(OS_MACOSX)

17 #include "chrome/browser/mac/keystone_glue.h"	16 #include "chrome/browser/mac/keystone_glue.h"

(...skipping 121 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
139 DCHECK(g_brand_for_testing == NULL);	138 DCHECK(g_brand_for_testing == NULL);

140 g_brand_for_testing = brand_.c_str();	139 g_brand_for_testing = brand_.c_str();

141 }	140 }

142	141

143 BrandForTesting::~BrandForTesting() {	142 BrandForTesting::~BrandForTesting() {

144 g_brand_for_testing = NULL;	143 g_brand_for_testing = NULL;

145 }	144 }

146	145

147	146

148 } // namespace google_brand	147 } // namespace google_brand

OLD	NEW