mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-13 02:20:45 +01:00
5ea849829f
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1916@1685 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
Index: public/renderer/content_renderer_client.cc
|
|
===================================================================
|
|
--- public/renderer/content_renderer_client.cc (revision 266998)
|
|
+++ public/renderer/content_renderer_client.cc (working copy)
|
|
@@ -92,7 +92,6 @@
|
|
return false;
|
|
}
|
|
|
|
-#ifdef OS_ANDROID
|
|
bool ContentRendererClient::HandleNavigation(
|
|
RenderFrame* render_frame,
|
|
DocumentState* document_state,
|
|
@@ -104,7 +103,6 @@
|
|
bool is_redirect) {
|
|
return false;
|
|
}
|
|
-#endif
|
|
|
|
bool ContentRendererClient::ShouldFork(blink::WebFrame* frame,
|
|
const GURL& url,
|
|
Index: public/renderer/content_renderer_client.h
|
|
===================================================================
|
|
--- public/renderer/content_renderer_client.h (revision 266998)
|
|
+++ public/renderer/content_renderer_client.h (working copy)
|
|
@@ -175,7 +175,6 @@
|
|
// Returns true if a popup window should be allowed.
|
|
virtual bool AllowPopup();
|
|
|
|
-#ifdef OS_ANDROID
|
|
// TODO(sgurun) This callback is deprecated and will be removed as soon
|
|
// as android webview completes implementation of a resource throttle based
|
|
// shouldoverrideurl implementation. See crbug.com/325351
|
|
@@ -190,7 +189,6 @@
|
|
blink::WebNavigationType type,
|
|
blink::WebNavigationPolicy default_policy,
|
|
bool is_redirect);
|
|
-#endif
|
|
|
|
// Returns true if we should fork a new process for the given navigation.
|
|
// If |send_referrer| is set to false (which is the default), no referrer
|
|
Index: renderer/render_frame_impl.cc
|
|
===================================================================
|
|
--- renderer/render_frame_impl.cc (revision 266998)
|
|
+++ renderer/render_frame_impl.cc (working copy)
|
|
@@ -2662,7 +2662,6 @@
|
|
WebNavigationType type,
|
|
WebNavigationPolicy default_policy,
|
|
bool is_redirect) {
|
|
-#ifdef OS_ANDROID
|
|
// The handlenavigation API is deprecated and will be removed once
|
|
// crbug.com/325351 is resolved.
|
|
if (request.url() != GURL(kSwappedOutURL) &&
|
|
@@ -2677,7 +2676,6 @@
|
|
is_redirect)) {
|
|
return blink::WebNavigationPolicyIgnore;
|
|
}
|
|
-#endif
|
|
|
|
Referrer referrer(RenderViewImpl::GetReferrerFromRequest(frame, request));
|
|
|