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

Unified Diff: extensions/renderer/dispatcher.cc

Issue 315413004: Remove param |context_type| from InitOriginPermissions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: is_extension_active Created 6 years, 6 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 | « extensions/renderer/dispatcher.h ('k') | extensions/renderer/dispatcher_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/dispatcher.cc
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
index 39d862dbe7c33f78197b6cb4bac08bac1cb6653c..71971591816fb86c06c8a44bc5cda5816f496628 100644
--- a/extensions/renderer/dispatcher.cc
+++ b/extensions/renderer/dispatcher.cc
@@ -259,7 +259,7 @@ void Dispatcher::DidCreateScriptContext(
script_context_set_.Add(context);
if (extension) {
- InitOriginPermissions(extension, context_type);
+ InitOriginPermissions(extension);
}
{
@@ -797,9 +797,9 @@ void Dispatcher::UpdateActiveExtensions() {
delegate_->OnActiveExtensionsUpdated(active_extensions);
}
-void Dispatcher::InitOriginPermissions(const Extension* extension,
- Feature::Context context_type) {
- delegate_->InitOriginPermissions(extension, context_type);
+void Dispatcher::InitOriginPermissions(const Extension* extension) {
+ delegate_->InitOriginPermissions(extension,
+ IsExtensionActive(extension->id()));
UpdateOriginPermissions(
UpdatedExtensionPermissionsInfo::ADDED,
extension,
« no previous file with comments | « extensions/renderer/dispatcher.h ('k') | extensions/renderer/dispatcher_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698