| Index: chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
|
| diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc b/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
|
| index 0e1999ddf51bc74c91b1f8ed232ae5be0104fa1c..5e046cd989bef634a28405300f515f055c12b52b 100644
|
| --- a/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
|
| +++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate.cc
|
| @@ -39,22 +39,18 @@ bool RendererPermissionsPolicyDelegate::CanExecuteScriptOnPage(
|
| return true;
|
| }
|
|
|
| - CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| if (command_line->HasSwitch(::switches::kSigninProcess)) {
|
| if (error)
|
| *error = errors::kCannotScriptSigninPage;
|
| return false;
|
| }
|
|
|
| -// TODO(thestig): Remove scaffolding once this file no longer builds with
|
| -// extensions disabled.
|
| -#if defined(ENABLE_EXTENSIONS)
|
| - if (dispatcher_->IsExtensionActive(extensions::kWebStoreAppId)) {
|
| + if (dispatcher_->IsExtensionActive(kWebStoreAppId)) {
|
| if (error)
|
| *error = errors::kCannotScriptGallery;
|
| return false;
|
| }
|
| -#endif
|
|
|
| return true;
|
| }
|
|
|