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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 494993004: Move external popup menus from WebViewClient to WebFrameClient, part 1/3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 #if defined(ENABLE_BROWSER_CDMS) 143 #if defined(ENABLE_BROWSER_CDMS)
144 #include "content/renderer/media/crypto/renderer_cdm_manager.h" 144 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
145 #endif 145 #endif
146 146
147 using blink::WebContextMenuData; 147 using blink::WebContextMenuData;
148 using blink::WebData; 148 using blink::WebData;
149 using blink::WebDataSource; 149 using blink::WebDataSource;
150 using blink::WebDocument; 150 using blink::WebDocument;
151 using blink::WebElement; 151 using blink::WebElement;
152 using blink::WebExternalPopupMenu;
153 using blink::WebExternalPopupMenuClient;
152 using blink::WebFrame; 154 using blink::WebFrame;
153 using blink::WebHistoryItem; 155 using blink::WebHistoryItem;
154 using blink::WebHTTPBody; 156 using blink::WebHTTPBody;
155 using blink::WebLocalFrame; 157 using blink::WebLocalFrame;
156 using blink::WebMediaPlayer; 158 using blink::WebMediaPlayer;
157 using blink::WebMediaPlayerClient; 159 using blink::WebMediaPlayerClient;
158 using blink::WebNavigationPolicy; 160 using blink::WebNavigationPolicy;
159 using blink::WebNavigationType; 161 using blink::WebNavigationType;
160 using blink::WebNode; 162 using blink::WebNode;
161 using blink::WebPluginParams; 163 using blink::WebPluginParams;
164 using blink::WebPopupMenuInfo;
162 using blink::WebRange; 165 using blink::WebRange;
163 using blink::WebReferrerPolicy; 166 using blink::WebReferrerPolicy;
164 using blink::WebScriptSource; 167 using blink::WebScriptSource;
165 using blink::WebSearchableFormData; 168 using blink::WebSearchableFormData;
166 using blink::WebSecurityOrigin; 169 using blink::WebSecurityOrigin;
167 using blink::WebSecurityPolicy; 170 using blink::WebSecurityPolicy;
168 using blink::WebServiceWorkerProvider; 171 using blink::WebServiceWorkerProvider;
169 using blink::WebStorageQuotaCallbacks; 172 using blink::WebStorageQuotaCallbacks;
170 using blink::WebString; 173 using blink::WebString;
171 using blink::WebURL; 174 using blink::WebURL;
(...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1552 blink::WebWorkerPermissionClientProxy* 1555 blink::WebWorkerPermissionClientProxy*
1553 RenderFrameImpl::createWorkerPermissionClientProxy( 1556 RenderFrameImpl::createWorkerPermissionClientProxy(
1554 blink::WebLocalFrame* frame) { 1557 blink::WebLocalFrame* frame) {
1555 if (!frame || !frame->view()) 1558 if (!frame || !frame->view())
1556 return NULL; 1559 return NULL;
1557 DCHECK(!frame_ || frame_ == frame); 1560 DCHECK(!frame_ || frame_ == frame);
1558 return GetContentClient()->renderer()->CreateWorkerPermissionClientProxy( 1561 return GetContentClient()->renderer()->CreateWorkerPermissionClientProxy(
1559 this, frame); 1562 this, frame);
1560 } 1563 }
1561 1564
1565 WebExternalPopupMenu* RenderFrameImpl::createExternalPopupMenu(
1566 const WebPopupMenuInfo& popup_menu_info,
1567 WebExternalPopupMenuClient* popup_menu_client) {
1568 return render_view_->createExternalPopupMenu(popup_menu_info,
1569 popup_menu_client);
1570 }
1571
1562 blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebLocalFrame* frame) { 1572 blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebLocalFrame* frame) {
1563 DCHECK(!frame_ || frame_ == frame); 1573 DCHECK(!frame_ || frame_ == frame);
1564 return &cookie_jar_; 1574 return &cookie_jar_;
1565 } 1575 }
1566 1576
1567 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider( 1577 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider(
1568 blink::WebLocalFrame* frame) { 1578 blink::WebLocalFrame* frame) {
1569 DCHECK(!frame_ || frame_ == frame); 1579 DCHECK(!frame_ || frame_ == frame);
1570 // At this point we should have non-null data source. 1580 // At this point we should have non-null data source.
1571 DCHECK(frame->dataSource()); 1581 DCHECK(frame->dataSource());
(...skipping 2162 matching lines...) Expand 10 before | Expand all | Expand 10 after
3734 3744
3735 #if defined(ENABLE_BROWSER_CDMS) 3745 #if defined(ENABLE_BROWSER_CDMS)
3736 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3746 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3737 if (!cdm_manager_) 3747 if (!cdm_manager_)
3738 cdm_manager_ = new RendererCdmManager(this); 3748 cdm_manager_ = new RendererCdmManager(this);
3739 return cdm_manager_; 3749 return cdm_manager_;
3740 } 3750 }
3741 #endif // defined(ENABLE_BROWSER_CDMS) 3751 #endif // defined(ENABLE_BROWSER_CDMS)
3742 3752
3743 } // namespace content 3753 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698