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

Side by Side Diff: chrome/common/extensions/chrome_extensions_client.cc

Issue 2141703003: [Extensions] Clean up renderer channel-related code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dc_feature_no_filter
Patch Set: Test fix Created 4 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/common/extensions/chrome_extensions_client.h" 5 #include "chrome/common/extensions/chrome_extensions_client.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // TODO(battre): Delete the HTTP URL once the blacklist is downloaded via HTTPS. 58 // TODO(battre): Delete the HTTP URL once the blacklist is downloaded via HTTPS.
59 const char kExtensionBlocklistUrlPrefix[] = 59 const char kExtensionBlocklistUrlPrefix[] =
60 "http://www.gstatic.com/chrome/extensions/blacklist"; 60 "http://www.gstatic.com/chrome/extensions/blacklist";
61 const char kExtensionBlocklistHttpsUrlPrefix[] = 61 const char kExtensionBlocklistHttpsUrlPrefix[] =
62 "https://www.gstatic.com/chrome/extensions/blacklist"; 62 "https://www.gstatic.com/chrome/extensions/blacklist";
63 63
64 const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh"; 64 const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh";
65 65
66 template <class FeatureClass> 66 template <class FeatureClass>
67 SimpleFeature* CreateFeature() { 67 SimpleFeature* CreateFeature() {
68 SimpleFeature* feature = new FeatureClass(); 68 return new FeatureClass();
69 feature->set_check_channel(true);
Devlin 2016/07/14 17:32:11 Woohoo, we can indeed remove this.
70 return feature;
71 } 69 }
72 70
73 // Mirrors version_info::Channel for histograms. 71 // Mirrors version_info::Channel for histograms.
74 enum ChromeChannelForHistogram { 72 enum ChromeChannelForHistogram {
75 CHANNEL_UNKNOWN, 73 CHANNEL_UNKNOWN,
76 CHANNEL_CANARY, 74 CHANNEL_CANARY,
77 CHANNEL_DEV, 75 CHANNEL_DEV,
78 CHANNEL_BETA, 76 CHANNEL_BETA,
79 CHANNEL_STABLE, 77 CHANNEL_STABLE,
80 NUM_CHANNELS_FOR_HISTOGRAM 78 NUM_CHANNELS_FOR_HISTOGRAM
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 const { 373 const {
376 return GetCurrentChannel() == version_info::Channel::UNKNOWN; 374 return GetCurrentChannel() == version_info::Channel::UNKNOWN;
377 } 375 }
378 376
379 // static 377 // static
380 ChromeExtensionsClient* ChromeExtensionsClient::GetInstance() { 378 ChromeExtensionsClient* ChromeExtensionsClient::GetInstance() {
381 return g_client.Pointer(); 379 return g_client.Pointer();
382 } 380 }
383 381
384 } // namespace extensions 382 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.cc ('k') | chrome/common/extensions/features/feature_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698