diff options
| author | rob <rob@robwu.nl> | 2016-02-29 12:26:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-29 20:27:27 +0000 |
| commit | 1166ab3f3b882af3873099103fc2fbf577cd3a72 (patch) | |
| tree | 3d1f1794b846eed8359c636d1f696a6210116579 /extensions/renderer | |
| parent | 9e669cbd356aad5447705a78351c4ef68747afca (diff) | |
| download | chromium_src-1166ab3f3b882af3873099103fc2fbf577cd3a72.zip chromium_src-1166ab3f3b882af3873099103fc2fbf577cd3a72.tar.gz chromium_src-1166ab3f3b882af3873099103fc2fbf577cd3a72.tar.bz2 | |
Classify extension frames as extensions
ScriptContextSet::GetExtensionFromFrameAndWorld did not return an
Extension* for an extension frame if the origin is unique. This check
was added in https://codereview.chromium.org/16625012/diff2/43001:57001/chrome/renderer/extensions/dispatcher.cc
and already with a TODO to remove it.
Now I'm removing the check because that CL did not show any valid reason
for keeping it, and it's causing a bug.
BUG=544182
TEST=./browser_tests --gtest_filter=ExtensionLoadingTest.RuntimeValidWhileDevToolsOpen
Review URL: https://codereview.chromium.org/1746473002
Cr-Commit-Position: refs/heads/master@{#378257}
Diffstat (limited to 'extensions/renderer')
| -rw-r--r-- | extensions/renderer/script_context_set.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/extensions/renderer/script_context_set.cc b/extensions/renderer/script_context_set.cc index 84cf02d..18f367c 100644 --- a/extensions/renderer/script_context_set.cc +++ b/extensions/renderer/script_context_set.cc @@ -132,8 +132,7 @@ const Extension* ScriptContextSet::GetExtensionFromFrameAndWorld( if (world_id != 0) { // Isolated worlds (content script). extension_id = ScriptInjection::GetHostIdForIsolatedWorld(world_id); - } else if (!frame->document().securityOrigin().isUnique()) { - // TODO(kalman): Delete the above check. + } else { // Extension pages (chrome-extension:// URLs). GURL frame_url = ScriptContext::GetDataSourceURLForFrame(frame); frame_url = ScriptContext::GetEffectiveDocumentURL(frame, frame_url, |