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

Side by Side Diff: chrome/renderer/render_view.cc

Issue 155378: Replace ShowAsPopupWithItems to CreatePopupWidgetWithInfo. Also,... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 | « chrome/renderer/render_view.h ('k') | chrome/renderer/render_widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 using webkit_glue::PasswordForm; 100 using webkit_glue::PasswordForm;
101 using webkit_glue::PasswordFormDomManager; 101 using webkit_glue::PasswordFormDomManager;
102 using webkit_glue::SearchableFormData; 102 using webkit_glue::SearchableFormData;
103 using WebKit::WebConsoleMessage; 103 using WebKit::WebConsoleMessage;
104 using WebKit::WebData; 104 using WebKit::WebData;
105 using WebKit::WebDataSource; 105 using WebKit::WebDataSource;
106 using WebKit::WebDragData; 106 using WebKit::WebDragData;
107 using WebKit::WebForm; 107 using WebKit::WebForm;
108 using WebKit::WebHistoryItem; 108 using WebKit::WebHistoryItem;
109 using WebKit::WebNavigationType; 109 using WebKit::WebNavigationType;
110 using WebKit::WebPopupMenuInfo;
110 using WebKit::WebRect; 111 using WebKit::WebRect;
111 using WebKit::WebScriptSource; 112 using WebKit::WebScriptSource;
112 using WebKit::WebSize; 113 using WebKit::WebSize;
113 using WebKit::WebString; 114 using WebKit::WebString;
114 using WebKit::WebURL; 115 using WebKit::WebURL;
115 using WebKit::WebURLError; 116 using WebKit::WebURLError;
116 using WebKit::WebURLRequest; 117 using WebKit::WebURLRequest;
117 using WebKit::WebURLResponse; 118 using WebKit::WebURLResponse;
118 using WebKit::WebWorker; 119 using WebKit::WebWorker;
119 using WebKit::WebWorkerClient; 120 using WebKit::WebWorkerClient;
(...skipping 1632 matching lines...) Expand 10 before | Expand all | Expand 10 after
1752 } 1753 }
1753 1754
1754 WebWidget* RenderView::CreatePopupWidget(WebView* webview, 1755 WebWidget* RenderView::CreatePopupWidget(WebView* webview,
1755 bool activatable) { 1756 bool activatable) {
1756 RenderWidget* widget = RenderWidget::Create(routing_id_, 1757 RenderWidget* widget = RenderWidget::Create(routing_id_,
1757 render_thread_, 1758 render_thread_,
1758 activatable); 1759 activatable);
1759 return widget->webwidget(); 1760 return widget->webwidget();
1760 } 1761 }
1761 1762
1763 WebWidget* RenderView::CreatePopupWidgetWithInfo(WebView* webview,
1764 const WebPopupMenuInfo& info) {
1765 RenderWidget* widget = RenderWidget::Create(routing_id_,
1766 render_thread_,
1767 true);
1768 widget->ConfigureAsExternalPopupMenu(info);
1769 return widget->webwidget();
1770 }
1771
1762 WebPluginDelegate* RenderView::CreatePluginDelegate( 1772 WebPluginDelegate* RenderView::CreatePluginDelegate(
1763 WebView* webview, 1773 WebView* webview,
1764 const GURL& url, 1774 const GURL& url,
1765 const std::string& mime_type, 1775 const std::string& mime_type,
1766 const std::string& clsid, 1776 const std::string& clsid,
1767 std::string* actual_mime_type) { 1777 std::string* actual_mime_type) {
1768 if (!PluginChannelHost::IsListening()) 1778 if (!PluginChannelHost::IsListening())
1769 return NULL; 1779 return NULL;
1770 1780
1771 GURL policy_url; 1781 GURL policy_url;
(...skipping 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after
3030 Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms)); 3040 Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms));
3031 } 3041 }
3032 3042
3033 void RenderView::Print(WebFrame* frame, bool script_initiated) { 3043 void RenderView::Print(WebFrame* frame, bool script_initiated) {
3034 DCHECK(frame); 3044 DCHECK(frame);
3035 if (print_helper_.get() == NULL) { 3045 if (print_helper_.get() == NULL) {
3036 print_helper_.reset(new PrintWebViewHelper(this)); 3046 print_helper_.reset(new PrintWebViewHelper(this));
3037 } 3047 }
3038 print_helper_->Print(frame, script_initiated); 3048 print_helper_->Print(frame, script_initiated);
3039 } 3049 }
OLDNEW
« no previous file with comments | « chrome/renderer/render_view.h ('k') | chrome/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698