This CL prepares chromium for removing same origin check as blink checks for the same.

BUG=406236

Review URL: https://codereview.chromium.org/485103005

Cr-Commit-Position: refs/heads/master@{#291375}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291375 0039d316-1c4b-4281-b951-d872f2087c98
parent ea3bc300
...@@ -3908,6 +3908,7 @@ double RenderViewImpl::zoomFactorToZoomLevel(double factor) const { ...@@ -3908,6 +3908,7 @@ double RenderViewImpl::zoomFactorToZoomLevel(double factor) const {
return ZoomFactorToZoomLevel(factor); return ZoomFactorToZoomLevel(factor);
} }
// TODO(sanjoy.pal): Remove once blink patch lands. http://crbug.com/406236.
void RenderViewImpl::registerProtocolHandler(const WebString& scheme, void RenderViewImpl::registerProtocolHandler(const WebString& scheme,
const WebURL& base_url, const WebURL& base_url,
const WebURL& url, const WebURL& url,
...@@ -3939,6 +3940,26 @@ void RenderViewImpl::unregisterProtocolHandler(const WebString& scheme, ...@@ -3939,6 +3940,26 @@ void RenderViewImpl::unregisterProtocolHandler(const WebString& scheme,
user_gesture)); user_gesture));
} }
void RenderViewImpl::registerProtocolHandler(const WebString& scheme,
const WebURL& url,
const WebString& title) {
bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture();
Send(new ViewHostMsg_RegisterProtocolHandler(routing_id_,
base::UTF16ToUTF8(scheme),
url,
title,
user_gesture));
}
void RenderViewImpl::unregisterProtocolHandler(const WebString& scheme,
const WebURL& url) {
bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture();
Send(new ViewHostMsg_UnregisterProtocolHandler(routing_id_,
base::UTF16ToUTF8(scheme),
url,
user_gesture));
}
blink::WebPageVisibilityState RenderViewImpl::visibilityState() const { blink::WebPageVisibilityState RenderViewImpl::visibilityState() const {
blink::WebPageVisibilityState current_state = is_hidden() ? blink::WebPageVisibilityState current_state = is_hidden() ?
blink::WebPageVisibilityStateHidden : blink::WebPageVisibilityStateHidden :
......
...@@ -425,6 +425,8 @@ class CONTENT_EXPORT RenderViewImpl ...@@ -425,6 +425,8 @@ class CONTENT_EXPORT RenderViewImpl
virtual void zoomLevelChanged(); virtual void zoomLevelChanged();
virtual double zoomLevelToZoomFactor(double zoom_level) const; virtual double zoomLevelToZoomFactor(double zoom_level) const;
virtual double zoomFactorToZoomLevel(double factor) const; virtual double zoomFactorToZoomLevel(double factor) const;
// TODO(sanjoy.pal): Remove once blink patch lands. http://crbug.com/406236.
virtual void registerProtocolHandler(const blink::WebString& scheme, virtual void registerProtocolHandler(const blink::WebString& scheme,
const blink::WebURL& base_url, const blink::WebURL& base_url,
const blink::WebURL& url, const blink::WebURL& url,
...@@ -432,6 +434,11 @@ class CONTENT_EXPORT RenderViewImpl ...@@ -432,6 +434,11 @@ class CONTENT_EXPORT RenderViewImpl
virtual void unregisterProtocolHandler(const blink::WebString& scheme, virtual void unregisterProtocolHandler(const blink::WebString& scheme,
const blink::WebURL& base_url, const blink::WebURL& base_url,
const blink::WebURL& url); const blink::WebURL& url);
virtual void registerProtocolHandler(const blink::WebString& scheme,
const blink::WebURL& url,
const blink::WebString& title);
virtual void unregisterProtocolHandler(const blink::WebString& scheme,
const blink::WebURL& url);
virtual blink::WebPageVisibilityState visibilityState() const; virtual blink::WebPageVisibilityState visibilityState() const;
virtual blink::WebPushClient* webPushClient(); virtual blink::WebPushClient* webPushClient();
virtual void draggableRegionsChanged(); virtual void draggableRegionsChanged();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment