diff options
| author | kouhei@chromium.org <kouhei@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 18:46:08 +0000 |
|---|---|---|
| committer | kouhei@chromium.org <kouhei@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-10 18:46:08 +0000 |
| commit | 17a9bc9822d4a551db44a09ffbb6eb0ee3f5abd3 (patch) | |
| tree | 4cf41de32bbdb9575030687a6e126d9f893d4f73 /extensions | |
| parent | 09560f7fd1e6cab1dcc129574c647624a9a30f5e (diff) | |
| download | chromium_src-17a9bc9822d4a551db44a09ffbb6eb0ee3f5abd3.zip chromium_src-17a9bc9822d4a551db44a09ffbb6eb0ee3f5abd3.tar.gz chromium_src-17a9bc9822d4a551db44a09ffbb6eb0ee3f5abd3.tar.bz2 | |
Remove param |context_type| from InitOriginPermissions
This CL is to prepare for https://codereview.chromium.org/315143003 .
This param |context_type| was added in https://codereview.chromium.org/169053005 ,
but its only usage in |ChromeExtensionsDispatcherDelegate::InitOriginPermissions|
seems unnecesary. The reason is that |WebSecurityPolicy::addOriginAccessWhitelistEntry|
operates on the global whitelist map valid for all context within
the renderer process.
BUG=380346, 380502
Review URL: https://codereview.chromium.org/315413004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/renderer/dispatcher.cc | 8 | ||||
| -rw-r--r-- | extensions/renderer/dispatcher.h | 3 | ||||
| -rw-r--r-- | extensions/renderer/dispatcher_delegate.h | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc index 39d862d..7197159 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, diff --git a/extensions/renderer/dispatcher.h b/extensions/renderer/dispatcher.h index 7358607..aaf2724 100644 --- a/extensions/renderer/dispatcher.h +++ b/extensions/renderer/dispatcher.h @@ -189,8 +189,7 @@ class Dispatcher : public content::RenderProcessObserver { void UpdateActiveExtensions(); // Sets up the host permissions for |extension|. - void InitOriginPermissions(const Extension* extension, - Feature::Context context_type); + void InitOriginPermissions(const Extension* extension); void UpdateOriginPermissions(UpdatedExtensionPermissionsInfo::Reason reason, const Extension* extension, const URLPatternSet& origins); diff --git a/extensions/renderer/dispatcher_delegate.h b/extensions/renderer/dispatcher_delegate.h index 13d557f..c8120c0 100644 --- a/extensions/renderer/dispatcher_delegate.h +++ b/extensions/renderer/dispatcher_delegate.h @@ -40,7 +40,7 @@ class DispatcherDelegate { // Initializes origin permissions for a newly created extension context. virtual void InitOriginPermissions(const Extension* extension, - Feature::Context context_type) {} + bool is_extension_active) {} // Includes additional native handlers in a given ModuleSystem. virtual void RegisterNativeHandlers(Dispatcher* dispatcher, |