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

Side by Side Diff: chrome/browser/extensions/extension_util.cc

Issue 1835863002: Added check for behavior feature existense (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make Get*Feature return |nullptr| instead crash if feature is missing Created 4 years, 8 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 | « no previous file | chrome/browser/ui/extensions/application_launch.cc » ('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 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/browser/extensions/extension_util.h" 5 #include "chrome/browser/extensions/extension_util.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 10 matching lines...) Expand all
21 #include "components/variations/variations_associated_data.h" 21 #include "components/variations/variations_associated_data.h"
22 #include "content/public/browser/site_instance.h" 22 #include "content/public/browser/site_instance.h"
23 #include "extensions/browser/extension_prefs.h" 23 #include "extensions/browser/extension_prefs.h"
24 #include "extensions/browser/extension_registry.h" 24 #include "extensions/browser/extension_registry.h"
25 #include "extensions/browser/extension_system.h" 25 #include "extensions/browser/extension_system.h"
26 #include "extensions/browser/extension_util.h" 26 #include "extensions/browser/extension_util.h"
27 #include "extensions/common/extension.h" 27 #include "extensions/common/extension.h"
28 #include "extensions/common/extension_icon_set.h" 28 #include "extensions/common/extension_icon_set.h"
29 #include "extensions/common/feature_switch.h" 29 #include "extensions/common/feature_switch.h"
30 #include "extensions/common/features/behavior_feature.h" 30 #include "extensions/common/features/behavior_feature.h"
31 #include "extensions/common/features/feature.h"
31 #include "extensions/common/features/feature_provider.h" 32 #include "extensions/common/features/feature_provider.h"
32 #include "extensions/common/manifest.h" 33 #include "extensions/common/manifest.h"
33 #include "extensions/common/manifest_handlers/app_isolation_info.h" 34 #include "extensions/common/manifest_handlers/app_isolation_info.h"
34 #include "extensions/common/manifest_handlers/incognito_info.h" 35 #include "extensions/common/manifest_handlers/incognito_info.h"
35 #include "extensions/common/permissions/permissions_data.h" 36 #include "extensions/common/permissions/permissions_data.h"
36 #include "extensions/grit/extensions_browser_resources.h" 37 #include "extensions/grit/extensions_browser_resources.h"
37 #include "ui/base/resource/resource_bundle.h" 38 #include "ui/base/resource/resource_bundle.h"
38 39
39 namespace extensions { 40 namespace extensions {
40 namespace util { 41 namespace util {
41 42
42 namespace { 43 namespace {
43 44
44 const char kSupervisedUserExtensionPermissionIncreaseFieldTrialName[] = 45 const char kSupervisedUserExtensionPermissionIncreaseFieldTrialName[] =
45 "SupervisedUserExtensionPermissionIncrease"; 46 "SupervisedUserExtensionPermissionIncrease";
46 47
47 // The entry into the ExtensionPrefs for allowing an extension to script on 48 // The entry into the ExtensionPrefs for allowing an extension to script on
48 // all urls without explicit permission. 49 // all urls without explicit permission.
49 const char kExtensionAllowedOnAllUrlsPrefName[] = 50 const char kExtensionAllowedOnAllUrlsPrefName[] =
50 "extension_can_script_all_urls"; 51 "extension_can_script_all_urls";
51 52
52 // The entry into the prefs for when a user has explicitly set the "extension 53 // The entry into the prefs for when a user has explicitly set the "extension
53 // allowed on all urls" pref. 54 // allowed on all urls" pref.
54 const char kHasSetScriptOnAllUrlsPrefName[] = "has_set_script_all_urls"; 55 const char kHasSetScriptOnAllUrlsPrefName[] = "has_set_script_all_urls";
55 56
56 // Returns true if |extension| should always be enabled in incognito mode. 57 // Returns true if |extension| should always be enabled in incognito mode.
57 bool IsWhitelistedForIncognito(const Extension* extension) { 58 bool IsWhitelistedForIncognito(const Extension* extension) {
58 return FeatureProvider::GetBehaviorFeature( 59 const Feature* feature = FeatureProvider::GetBehaviorFeature(
59 BehaviorFeature::kWhitelistedForIncognito) 60 BehaviorFeature::kWhitelistedForIncognito);
60 ->IsAvailableToExtension(extension) 61 return feature && feature->IsAvailableToExtension(extension).is_available();
61 .is_available();
62 } 62 }
63 63
64 // Returns |extension_id|. See note below. 64 // Returns |extension_id|. See note below.
65 std::string ReloadExtensionIfEnabled(const std::string& extension_id, 65 std::string ReloadExtensionIfEnabled(const std::string& extension_id,
66 content::BrowserContext* context) { 66 content::BrowserContext* context) {
67 ExtensionRegistry* registry = ExtensionRegistry::Get(context); 67 ExtensionRegistry* registry = ExtensionRegistry::Get(context);
68 bool extension_is_enabled = 68 bool extension_is_enabled =
69 registry->enabled_extensions().Contains(extension_id); 69 registry->enabled_extensions().Contains(extension_id);
70 70
71 if (!extension_is_enabled) 71 if (!extension_is_enabled)
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 base::FieldTrialList::FindFullName( 388 base::FieldTrialList::FindFullName(
389 kSupervisedUserExtensionPermissionIncreaseFieldTrialName); 389 kSupervisedUserExtensionPermissionIncreaseFieldTrialName);
390 std::string value = variations::GetVariationParamValue( 390 std::string value = variations::GetVariationParamValue(
391 kSupervisedUserExtensionPermissionIncreaseFieldTrialName, 391 kSupervisedUserExtensionPermissionIncreaseFieldTrialName,
392 profile->IsChild() ? "child_account" : "legacy_supervised_user"); 392 profile->IsChild() ? "child_account" : "legacy_supervised_user");
393 return value == "true"; 393 return value == "true";
394 } 394 }
395 395
396 } // namespace util 396 } // namespace util
397 } // namespace extensions 397 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698