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

Unified Diff: chrome/renderer/extensions/renderer_permissions_policy_delegate.cc

Issue 680213003: Cleanup: Remove most enable_extensions logic in chrome/ extensions code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/extensions/extension_frame_helper.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « chrome/renderer/extensions/extension_frame_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698