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

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

Issue 2328493002: Remove the tool to disable the outdated build detector for organic installs of Chrome. (Closed)
Patch Set: Created 4 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
« no previous file with comments | « BUILD.gn ('k') | chrome/tools/build/win/FILES.cfg » ('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 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 <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 bool IsOrganic(const std::string& brand) { 84 bool IsOrganic(const std::string& brand) {
85 #if defined(OS_MACOSX) 85 #if defined(OS_MACOSX)
86 if (brand.empty()) { 86 if (brand.empty()) {
87 // An empty brand string on Mac is used for channels other than stable, 87 // An empty brand string on Mac is used for channels other than stable,
88 // which are always organic. 88 // which are always organic.
89 return true; 89 return true;
90 } 90 }
91 #endif 91 #endif
92 92
93 // Changes to this list must be mirrored in
94 // chrome/tools/disable_outdated_build_detector/google_update_integration.cc.
95 const char* const kBrands[] = { 93 const char* const kBrands[] = {
96 "CHCA", "CHCB", "CHCG", "CHCH", "CHCI", "CHCJ", "CHCK", "CHCL", 94 "CHCA", "CHCB", "CHCG", "CHCH", "CHCI", "CHCJ", "CHCK", "CHCL",
97 "CHFO", "CHFT", "CHHS", "CHHM", "CHMA", "CHMB", "CHME", "CHMF", 95 "CHFO", "CHFT", "CHHS", "CHHM", "CHMA", "CHMB", "CHME", "CHMF",
98 "CHMG", "CHMH", "CHMI", "CHMQ", "CHMV", "CHNB", "CHNC", "CHNG", 96 "CHMG", "CHMH", "CHMI", "CHMQ", "CHMV", "CHNB", "CHNC", "CHNG",
99 "CHNH", "CHNI", "CHOA", "CHOB", "CHOC", "CHON", "CHOO", "CHOP", 97 "CHNH", "CHNI", "CHOA", "CHOB", "CHOC", "CHON", "CHOO", "CHOP",
100 "CHOQ", "CHOR", "CHOS", "CHOT", "CHOU", "CHOX", "CHOY", "CHOZ", 98 "CHOQ", "CHOR", "CHOS", "CHOT", "CHOU", "CHOX", "CHOY", "CHOZ",
101 "CHPD", "CHPE", "CHPF", "CHPG", "ECBA", "ECBB", "ECDA", "ECDB", 99 "CHPD", "CHPE", "CHPF", "CHPG", "ECBA", "ECBB", "ECDA", "ECDB",
102 "ECSA", "ECSB", "ECVA", "ECVB", "ECWA", "ECWB", "ECWC", "ECWD", 100 "ECSA", "ECSB", "ECVA", "ECVB", "ECWA", "ECWB", "ECWC", "ECWD",
103 "ECWE", "ECWF", "EUBB", "EUBC", "GGLA", "GGLS" 101 "ECWE", "ECWF", "EUBB", "EUBC", "GGLA", "GGLS"
104 }; 102 };
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 DCHECK(g_brand_for_testing == NULL); 139 DCHECK(g_brand_for_testing == NULL);
142 g_brand_for_testing = brand_.c_str(); 140 g_brand_for_testing = brand_.c_str();
143 } 141 }
144 142
145 BrandForTesting::~BrandForTesting() { 143 BrandForTesting::~BrandForTesting() {
146 g_brand_for_testing = NULL; 144 g_brand_for_testing = NULL;
147 } 145 }
148 146
149 147
150 } // namespace google_brand 148 } // namespace google_brand
OLDNEW
« no previous file with comments | « BUILD.gn ('k') | chrome/tools/build/win/FILES.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698