| 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..13620dc44391e3a3ccb65c106532f06e7fb6b0f7 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -20,11 +20,13 @@
|
| #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"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/common/extensions/extension_manifest_constants.h"
|
| +#include "chrome/common/extensions/extension_messages.h"
|
| #include "chrome/common/extensions/extension_process_policy.h"
|
| #include "chrome/common/extensions/extension_set.h"
|
| #include "chrome/common/extensions/incognito_handler.h"
|
| @@ -152,6 +154,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 +894,37 @@ 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) {
|
| + const GURL& url = request.url();
|
| + GURL referrer_url(request.httpHeaderField(WebString::fromUTF8("Referer")));
|
| + const ExtensionSet* exts = extension_dispatcher_->extensions();
|
| + const extensions::UrlHandlerInfo* handler = exts->GetHandlingAppForURL(url);
|
| + if (handler) {
|
| +// content::RenderView* view = GetRenderViewFromWebFrame(frame);
|
| +// return RenderThread::Get()->Send(
|
| +// new ExtensionHostMsg_OnRedirectUrlToApp(
|
| +// view->GetRoutingID(),
|
| +// handler->app->id(),
|
| +// handler->id,
|
| +// url,
|
| +// referrer_url));
|
| +
|
| + return RenderThread::Get()->Send(
|
| + new ExtensionHostMsg_OnRedirectUrlToApp(
|
| + handler->app->id(),
|
| + handler->id,
|
| + url,
|
| + referrer_url));
|
| + } else {
|
| + return false;
|
| + }
|
| +}
|
| +
|
| bool ChromeContentRendererClient::ShouldFork(WebFrame* frame,
|
| const GURL& url,
|
| const std::string& http_method,
|
|
|