Only show the checkbox for all urls when the switch is on

chrome/browser/extensions/permissions_updater.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/permissions_updater.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/permissions.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
-#include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_handlers/permissions_parser.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 
 using content::RenderProcessHost;
 using extensions::permissions_api_helpers::PackPermissionSet;
 
 namespace extensions {
@@ skipping 129 matching lines @@
       extension->permissions_data()->active_permissions().get());
 }
 
 void PermissionsUpdater::InitializePermissions(const Extension* extension) {
   scoped_refptr<const PermissionSet> active_permissions =
       ExtensionPrefs::Get(browser_context_)
           ->GetActivePermissions(extension->id());
   scoped_refptr<const PermissionSet> bounded_active =
       GetBoundedActivePermissions(extension, active_permissions);
 
-  // We withhold permissions iff the switch to do so is enabled, the extension
-  // shows up in chrome:extensions (so the user can grant withheld permissions),
-  // the extension is not part of chrome or corporate policy, and also not on
-  // the scripting whitelist. Additionally, we don't withhold if the extension
-  // has the preference to allow scripting on all urls.
+  // Withhold permissions only if the switch applies to this extension and the
+  // extension doesn't have the preference to allow scripting on all urls.
   bool should_withhold_permissions =
-      FeatureSwitch::scripts_require_action()->IsEnabled() &&
-      extension->ShouldDisplayInExtensionSettings() &&
-      !Manifest::IsPolicyLocation(extension->location()) &&
-      !Manifest::IsComponentLocation(extension->location()) &&
-      !PermissionsData::CanExecuteScriptEverywhere(extension) &&
+      util::ScriptsMayRequireActionForExtension(extension) &&
       !util::AllowedScriptingOnAllUrls(extension->id(), browser_context_);
 
   URLPatternSet granted_explicit_hosts;
   URLPatternSet withheld_explicit_hosts;
   SegregateUrlPermissions(bounded_active->explicit_hosts(),
                           should_withhold_permissions,
                           &granted_explicit_hosts,
                           &withheld_explicit_hosts);
 
   URLPatternSet granted_scriptable_hosts;
@@ skipping 163 matching lines @@
             Profile::FromBrowserContext(host->GetBrowserContext()))) {
       host->Send(new ExtensionMsg_UpdatePermissions(params));
     }
   }
 
   // Trigger the onAdded and onRemoved events in the extension.
   DispatchEvent(extension->id(), event_name, changed);
 }
 
 }  // namespace extensions