Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Unified Diff: content/public/renderer/content_renderer_client.h

Issue 24228003: Upstream ShouldOverrideUrlLoading changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add a forgotten merge reject Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/renderer/content_renderer_client.h
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 94a2929f5227eb36ee5237d73a779c8727d967c7..b12269d57c448e33e4b01b97ea06bd15e179241f 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -49,6 +49,7 @@ struct WebURLError;
namespace content {
+class DocumentState;
class RenderView;
class SynchronousCompositor;
struct KeySystemInfo;
@@ -169,7 +170,10 @@ class CONTENT_EXPORT ContentRendererClient {
// Returns true if the navigation was handled by the embedder and should be
// ignored by WebKit. This method is used by CEF.
- virtual bool HandleNavigation(WebKit::WebFrame* frame,
+ virtual bool HandleNavigation(RenderView* view,
+ DocumentState* document_state,
+ int opener_id,
+ WebKit::WebFrame* frame,
const WebKit::WebURLRequest& request,
WebKit::WebNavigationType type,
WebKit::WebNavigationPolicy default_policy,

Powered by Google App Engine
This is Rietveld 408576698