Commit b20c3222 authored by avi@chromium.org's avatar avi@chromium.org

Move external popup menus from WebViewClient to WebFrameClient, part 1/3.

BUG=304341
TEST=popup menus still work

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

Cr-Commit-Position: refs/heads/master@{#291280}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291280 0039d316-1c4b-4281-b951-d872f2087c98
parent b6246432
...@@ -149,6 +149,8 @@ using blink::WebData; ...@@ -149,6 +149,8 @@ using blink::WebData;
using blink::WebDataSource; using blink::WebDataSource;
using blink::WebDocument; using blink::WebDocument;
using blink::WebElement; using blink::WebElement;
using blink::WebExternalPopupMenu;
using blink::WebExternalPopupMenuClient;
using blink::WebFrame; using blink::WebFrame;
using blink::WebHistoryItem; using blink::WebHistoryItem;
using blink::WebHTTPBody; using blink::WebHTTPBody;
...@@ -159,6 +161,7 @@ using blink::WebNavigationPolicy; ...@@ -159,6 +161,7 @@ using blink::WebNavigationPolicy;
using blink::WebNavigationType; using blink::WebNavigationType;
using blink::WebNode; using blink::WebNode;
using blink::WebPluginParams; using blink::WebPluginParams;
using blink::WebPopupMenuInfo;
using blink::WebRange; using blink::WebRange;
using blink::WebReferrerPolicy; using blink::WebReferrerPolicy;
using blink::WebScriptSource; using blink::WebScriptSource;
...@@ -1563,6 +1566,13 @@ RenderFrameImpl::createWorkerPermissionClientProxy( ...@@ -1563,6 +1566,13 @@ RenderFrameImpl::createWorkerPermissionClientProxy(
this, frame); this, frame);
} }
WebExternalPopupMenu* RenderFrameImpl::createExternalPopupMenu(
const WebPopupMenuInfo& popup_menu_info,
WebExternalPopupMenuClient* popup_menu_client) {
return render_view_->createExternalPopupMenu(popup_menu_info,
popup_menu_client);
}
blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebLocalFrame* frame) { blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebLocalFrame* frame) {
DCHECK(!frame_ || frame_ == frame); DCHECK(!frame_ || frame_ == frame);
return &cookie_jar_; return &cookie_jar_;
......
...@@ -37,6 +37,8 @@ class TransportDIB; ...@@ -37,6 +37,8 @@ class TransportDIB;
struct FrameMsg_Navigate_Params; struct FrameMsg_Navigate_Params;
namespace blink { namespace blink {
class WebExternalPopupMenu;
class WebExternalPopupMenuClient;
class WebGeolocationClient; class WebGeolocationClient;
class WebInputEvent; class WebInputEvent;
class WebMouseEvent; class WebMouseEvent;
...@@ -48,6 +50,7 @@ class WebSecurityOrigin; ...@@ -48,6 +50,7 @@ class WebSecurityOrigin;
struct WebCompositionUnderline; struct WebCompositionUnderline;
struct WebContextMenuData; struct WebContextMenuData;
struct WebCursorInfo; struct WebCursorInfo;
struct WebPopupMenuInfo;
} }
namespace gfx { namespace gfx {
...@@ -282,6 +285,9 @@ class CONTENT_EXPORT RenderFrameImpl ...@@ -282,6 +285,9 @@ class CONTENT_EXPORT RenderFrameImpl
blink::WebApplicationCacheHostClient* client); blink::WebApplicationCacheHostClient* client);
virtual blink::WebWorkerPermissionClientProxy* virtual blink::WebWorkerPermissionClientProxy*
createWorkerPermissionClientProxy(blink::WebLocalFrame* frame); createWorkerPermissionClientProxy(blink::WebLocalFrame* frame);
virtual blink::WebExternalPopupMenu* createExternalPopupMenu(
const blink::WebPopupMenuInfo& popup_menu_info,
blink::WebExternalPopupMenuClient* popup_menu_client);
virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
virtual blink::WebServiceWorkerProvider* createServiceWorkerProvider( virtual blink::WebServiceWorkerProvider* createServiceWorkerProvider(
blink::WebLocalFrame* frame); blink::WebLocalFrame* frame);
......
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