Chromium Code Reviews| Index: chrome/renderer/chrome_content_renderer_client.cc |
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
| index f2c7bbb05a54c78db8709534f14b630c4709b429..facadb1e41e0996ec56b837bbf27bff81b7ad1f2 100644 |
| --- a/chrome/renderer/chrome_content_renderer_client.cc |
| +++ b/chrome/renderer/chrome_content_renderer_client.cc |
| @@ -20,6 +20,7 @@ |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/content_settings_pattern.h" |
| #include "chrome/common/extensions/api/extension_action/page_action_handler.h" |
| +#include "chrome/common/extensions/api/url_handlers/url_handlers_parser.h" |
| #include "chrome/common/extensions/background_info.h" |
| #include "chrome/common/extensions/csp_handler.h" |
| #include "chrome/common/extensions/extension.h" |
| @@ -76,6 +77,7 @@ |
| #include "components/autofill/renderer/password_generation_manager.h" |
| #include "components/visitedlink/renderer/visitedlink_slave.h" |
| #include "content/public/common/content_constants.h" |
| +#include "content/public/common/extension_system_messages.h" |
| #include "content/public/renderer/render_thread.h" |
| #include "content/public/renderer/render_view.h" |
| #include "content/public/renderer/render_view_visitor.h" |
| @@ -93,6 +95,7 @@ |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
| +#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" |
| @@ -133,6 +136,7 @@ using WebKit::WebURLError; |
| using WebKit::WebURLRequest; |
| using WebKit::WebURLResponse; |
| using WebKit::WebVector; |
| +using WebKit::WebNavigationType; |
| namespace { |
| @@ -152,6 +156,7 @@ void RegisterExtensionManifestHandlers() { |
| (new extensions::IncognitoHandler)->Register(); |
| (new extensions::PageActionHandler)->Register(); |
| (new extensions::SandboxedPageHandler)->Register(); |
| + (new extensions::UrlHandlersParser)->Register(); |
| (new extensions::WebAccessibleResourcesHandler)->Register(); |
| } |
| @@ -891,6 +896,41 @@ bool ChromeContentRendererClient::AllowPopup() { |
| extensions::Feature::CONTENT_SCRIPT_CONTEXT); |
| } |
| +bool ChromeContentRendererClient::HandleNavigation( |
| + WebKit::WebFrame* frame, |
| + const WebKit::WebURLRequest& request, |
| + WebKit::WebNavigationType type, |
| + WebKit::WebNavigationPolicy default_policy, |
| + bool is_redirect) { |
| + switch (type) { |
| + case WebKit::WebNavigationTypeLinkClicked: |
| + case WebKit::WebNavigationTypeFormSubmitted: |
| + case WebKit::WebNavigationTypeBackForward: |
| + case WebKit::WebNavigationTypeReload: |
| + case WebKit::WebNavigationTypeFormResubmitted: { |
| + const GURL& url = request.url(); |
| + GURL referrer_url( |
| + request.httpHeaderField(WebString::fromUTF8("Referer"))); |
| + const ExtensionSet* exts = extension_dispatcher_->extensions(); |
|
not at google - send to devlin
2013/08/19 23:32:24
inline?
sergeygs
2013/08/29 08:24:42
Why not :)
On 2013/08/19 23:32:24, kalman wrote:
|
| + const extensions::UrlHandlerInfo* handler = |
| + exts->GetHandlingAppForURL(url); |
| + if (handler) { |
| + return RenderThread::Get()->Send( |
| + new ExtensionSystemMsg_LaunchAppWithUrl( |
| + handler->app->id(), handler->id, url, referrer_url)); |
| + } else { |
| + return false; |
| + } |
|
not at google - send to devlin
2013/08/19 23:32:24
else clause is unnecessary
sergeygs
2013/08/29 08:24:42
Done.
On 2013/08/19 23:32:24, kalman wrote:
|
| + |
| + break; |
| + } |
| + case WebKit::WebNavigationTypeOther: |
| + default: |
|
not at google - send to devlin
2013/08/19 23:32:24
leave out the default cases so that the compiler v
sergeygs
2013/08/29 08:24:42
Done.
On 2013/08/19 23:32:24, kalman wrote:
|
| + break; |
| + } |
| + return false; |
| +} |
| + |
| bool ChromeContentRendererClient::ShouldFork(WebFrame* frame, |
| const GURL& url, |
| const std::string& http_method, |