diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 18:22:46 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 18:22:46 +0000 |
| commit | 84df8330d252faf3ac552ba40364d973ee19af81 (patch) | |
| tree | 98a7f3fee4d8226e41a8e80628bd8c906b69414b /chrome/renderer/extensions | |
| parent | 8a0941d2abb68b9626ac17cb5d1e4d9ecaa6303a (diff) | |
| download | chromium_src-84df8330d252faf3ac552ba40364d973ee19af81.zip chromium_src-84df8330d252faf3ac552ba40364d973ee19af81.tar.gz chromium_src-84df8330d252faf3ac552ba40364d973ee19af81.tar.bz2 | |
Revert 113071 - Revert 113047 - Make ExtensionService use ExtensionSet.
ExtensionManagementApiBrowserTest.LaunchApp fixed by r113141.
Make ExtensionSet iterate like a set instead of a map.
BUG=104091
TEST=existing tests
Review URL: http://codereview.chromium.org/8733004
TBR=yoz@chromium.org
Review URL: http://codereview.chromium.org/8789018
TBR=yoz@chromium.org
Review URL: http://codereview.chromium.org/8822021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions')
| -rw-r--r-- | chrome/renderer/extensions/extension_dispatcher.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc index cc003fd..c33b488 100644 --- a/chrome/renderer/extensions/extension_dispatcher.cc +++ b/chrome/renderer/extensions/extension_dispatcher.cc @@ -293,7 +293,7 @@ void ExtensionDispatcher::DidCreateScriptContext( extension_id = user_script_slave_->GetExtensionIdForIsolatedWorld(world_id); } else { GURL frame_url = UserScriptSlave::GetDataSourceURLForFrame(frame); - extension_id = extensions_.GetIdByURL( + extension_id = extensions_.GetIDByURL( ExtensionURLInfo(frame->document().securityOrigin(), frame_url)); } |