diff options
author | rdevlin.cronin <rdevlin.cronin@chromium.org> | 2015-06-24 11:49:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-24 18:49:50 +0000 |
commit | 86f5b7023f3c39cd38f571f923f1f780231853ed (patch) | |
tree | 00475d22a658cddcabd7ccf3ecf12171c02e6ba9 /extensions/browser/extension_web_contents_observer.h | |
parent | e4e5667ec6977d81c5acc1e6b9787d28b9514e5d (diff) | |
download | chromium_src-86f5b7023f3c39cd38f571f923f1f780231853ed.zip chromium_src-86f5b7023f3c39cd38f571f923f1f780231853ed.tar.gz chromium_src-86f5b7023f3c39cd38f571f923f1f780231853ed.tar.bz2 |
[Extensions OOPI] Update ErrorConsole and related to use RenderFrameHosts
Update ErrorConsole-related things, including adding runtime errors and the
developerPrivate API to use RenderFrameHosts.
Remove the message listener for console messages from TabHelper, since it should
be fully handled in ChromeExtensionWebContentsObserver.
Remove unneeded ExtensionError::ToValue code.
BUG=455776
BUG=503676
Review URL: https://codereview.chromium.org/1202753002
Cr-Commit-Position: refs/heads/master@{#335961}
Diffstat (limited to 'extensions/browser/extension_web_contents_observer.h')
-rw-r--r-- | extensions/browser/extension_web_contents_observer.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/extensions/browser/extension_web_contents_observer.h b/extensions/browser/extension_web_contents_observer.h index 266c0bf..c92ad9c 100644 --- a/extensions/browser/extension_web_contents_observer.h +++ b/extensions/browser/extension_web_contents_observer.h @@ -70,10 +70,21 @@ class ExtensionWebContentsObserver void PepperInstanceCreated() override; void PepperInstanceDeleted() override; + // Returns the extension id associated with the given |render_frame_host|, or + // the empty string if there is none. + std::string GetExtensionIdFromFrame( + content::RenderFrameHost* render_frame_host) const; + + // Returns the extension associated with the given |render_frame_host|, or + // null if there is none. + const Extension* GetExtensionFromFrame( + content::RenderFrameHost* render_frame_host) const; + + // TODO(devlin): Remove these once callers are updated to use the FromFrame + // equivalents. // Returns the extension or app associated with a render view host. Returns // NULL if the render view host is not for a valid extension. const Extension* GetExtension(content::RenderViewHost* render_view_host); - // Returns the extension or app ID associated with a render view host. Returns // the empty string if the render view host is not for a valid extension. static std::string GetExtensionId(content::RenderViewHost* render_view_host); |