diff options
| author | rdevlin.cronin <rdevlin.cronin@chromium.org> | 2015-06-03 15:28:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-03 22:28:40 +0000 |
| commit | f994d1efce89b17cf3443ee5a7750e805b44a0e9 (patch) | |
| tree | a308f710801ab2f6d8faca1111171c832a64137e /extensions/renderer/web_ui_injection_host.cc | |
| parent | 065b54b0a37ded63a33139db2c11ff73c43dd018 (diff) | |
| download | chromium_src-f994d1efce89b17cf3443ee5a7750e805b44a0e9.zip chromium_src-f994d1efce89b17cf3443ee5a7750e805b44a0e9.tar.gz chromium_src-f994d1efce89b17cf3443ee5a7750e805b44a0e9.tar.bz2 | |
[Extensions] Use document url (not top url) for tab-specific permissions
Fix a bug where activeTab would grant script access to all frames in a tab,
instead of just the top one. Also remove the top_document_url parameter from
CanAccessPage and similar methods.
BUG=495883
Review URL: https://codereview.chromium.org/1150683007
Cr-Commit-Position: refs/heads/master@{#332710}
Diffstat (limited to 'extensions/renderer/web_ui_injection_host.cc')
| -rw-r--r-- | extensions/renderer/web_ui_injection_host.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extensions/renderer/web_ui_injection_host.cc b/extensions/renderer/web_ui_injection_host.cc index 5c6e117..799f3fa 100644 --- a/extensions/renderer/web_ui_injection_host.cc +++ b/extensions/renderer/web_ui_injection_host.cc @@ -25,10 +25,10 @@ const std::string& WebUIInjectionHost::name() const { } extensions::PermissionsData::AccessType WebUIInjectionHost::CanExecuteOnFrame( - const GURL& document_url, - const GURL& top_frame_url, - int tab_id, - bool is_declarative) const { + const GURL& document_url, + content::RenderFrame* render_frame, + int tab_id, + bool is_declarative) const { // Content scripts are allowed to inject on webviews created by WebUI. return extensions::PermissionsData::AccessType::ACCESS_ALLOWED; } |