Add a new ContentRendererClient::HandleNavigation callback in RenderViewImpl::decidePolicyForNaviga…

content/public/renderer/content_renderer_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
 #define CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
 
 #include <string>
 
 #include "base/string16.h"
 #include "base/memory/weak_ptr.h"
 #include "ipc/ipc_message.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/page_transition_types.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityState.h"
 #include "v8/include/v8.h"
 
 class FilePath;
 class GURL;
 class SkBitmap;
 
 namespace WebKit {
 class WebAudioSourceProvider;
 class WebFrame;
@@ skipping 98 matching lines @@
       webkit_media::MediaStreamClient* media_stream_client,
       media::MediaLog* media_log);
 
   // Returns true if the renderer process should schedule the idle handler when
   // all widgets are hidden.
   virtual bool RunIdleHandlerWhenWidgetsHidden();
 
   // Returns true if the given url can create popup windows.
   virtual bool AllowPopup(const GURL& creator);
 
+  // Returns true if the navigation was handled and should be ignored by WebKit.

[Charlie Reis, 2012/11/08 19:24:51]

nit: was handled by the embedder

[Marshall, 2012/11/08 19:32:36]

Done.

+  virtual bool HandleNavigation(WebKit::WebFrame* frame,

[Charlie Reis, 2012/11/08 19:24:51]

John, maybe this should be DidHandleNavigation?

That seems more consistent with similar APIs we have in the Chromium WebKit API,
though I guess there are other "Handle" methods below.

[Marshall, 2012/11/08 19:32:36]

I'm OK with whatever name is preferred.

[jam, 2012/11/08 21:10:07]

I think the "Did" prefix would be applicable when the function is just informing
the embedder of something. Since this has a return value and can change state,
the current name is good.

+                                const WebKit::WebURLRequest& request,
+                                WebKit::WebNavigationType type,
+                                WebKit::WebNavigationPolicy default_policy,
+                                bool is_redirect);
+
   // Returns true if we should fork a new process for the given navigation.
   virtual bool ShouldFork(WebKit::WebFrame* frame,
                           const GURL& url,
                           bool is_initial_navigation,
                           bool* send_referrer);
 
   // Notifies the embedder that the given frame is requesting the resource at
   // |url|.  If the function returns true, the url is changed to |new_url|.
   virtual bool WillSendRequest(WebKit::WebFrame* frame,
                                PageTransition transition_type,
@@ skipping 36 matching lines @@
                                       const GURL& first_party_for_cookies,
                                       const std::string& value);
 
   virtual void RegisterPPAPIInterfaceFactories(
       webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_