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

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

Issue 2775003: Added plumbing to transport the frame name between RenderViewHost and the Webkit layer. (Closed)
Patch Set: Added plumbing from chrome -> webkit api. Created 10 years, 6 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #ifndef CHROME_RENDERER_RENDER_VIEW_H_ 5 #ifndef CHROME_RENDERER_RENDER_VIEW_H_
6 #define CHROME_RENDERER_RENDER_VIEW_H_ 6 #define CHROME_RENDERER_RENDER_VIEW_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 // |counter| is either a currently initialized counter, or NULL (in which case 155 // |counter| is either a currently initialized counter, or NULL (in which case
156 // we treat this RenderView as a top level window). 156 // we treat this RenderView as a top level window).
157 static RenderView* Create( 157 static RenderView* Create(
158 RenderThreadBase* render_thread, 158 RenderThreadBase* render_thread,
159 gfx::NativeViewId parent_hwnd, 159 gfx::NativeViewId parent_hwnd,
160 int32 opener_id, 160 int32 opener_id,
161 const RendererPreferences& renderer_prefs, 161 const RendererPreferences& renderer_prefs,
162 const WebPreferences& webkit_prefs, 162 const WebPreferences& webkit_prefs,
163 SharedRenderViewCounter* counter, 163 SharedRenderViewCounter* counter,
164 int32 routing_id, 164 int32 routing_id,
165 int64 session_storage_namespace_id); 165 int64 session_storage_namespace_id,
166 const string16& frame_name);
166 167
167 // Sets the "next page id" counter. 168 // Sets the "next page id" counter.
168 static void SetNextPageID(int32 next_page_id); 169 static void SetNextPageID(int32 next_page_id);
169 170
170 // May return NULL when the view is closing. 171 // May return NULL when the view is closing.
171 WebKit::WebView* webview() const { 172 WebKit::WebView* webview() const {
172 return static_cast<WebKit::WebView*>(webwidget()); 173 return static_cast<WebKit::WebView*>(webwidget());
173 } 174 }
174 175
175 int browser_window_id() const { 176 int browser_window_id() const {
(...skipping 22 matching lines...) Expand all
198 const WebKit::WebURLError& error, 199 const WebKit::WebURLError& error,
199 const std::string& html, 200 const std::string& html,
200 bool replace); 201 bool replace);
201 virtual void OnMissingPluginStatus( 202 virtual void OnMissingPluginStatus(
202 WebPluginDelegateProxy* delegate, 203 WebPluginDelegateProxy* delegate,
203 int status); 204 int status);
204 virtual void UserMetricsRecordAction(const std::string& action); 205 virtual void UserMetricsRecordAction(const std::string& action);
205 virtual void DnsPrefetch(const std::vector<std::string>& host_names); 206 virtual void DnsPrefetch(const std::vector<std::string>& host_names);
206 207
207 // WebKit::WebViewClient 208 // WebKit::WebViewClient
209 // TODO(atwilson): Remove this API when we push related changes upstream
208 virtual WebKit::WebView* createView( 210 virtual WebKit::WebView* createView(
209 WebKit::WebFrame* creator, 211 WebKit::WebFrame* creator,
210 const WebKit::WebWindowFeatures& features); 212 const WebKit::WebWindowFeatures& features);
213 virtual WebKit::WebView* createView(
214 WebKit::WebFrame* creator,
215 const WebKit::WebWindowFeatures& features,
216 const WebKit::WebString& frame_name);
211 virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type); 217 virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type);
212 virtual WebKit::WebWidget* createPopupMenu( 218 virtual WebKit::WebWidget* createPopupMenu(
213 const WebKit::WebPopupMenuInfo& info); 219 const WebKit::WebPopupMenuInfo& info);
214 virtual WebKit::WebStorageNamespace* createSessionStorageNamespace( 220 virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(
215 unsigned quota); 221 unsigned quota);
216 virtual void didAddMessageToConsole( 222 virtual void didAddMessageToConsole(
217 const WebKit::WebConsoleMessage& message, 223 const WebKit::WebConsoleMessage& message,
218 const WebKit::WebString& source_name, unsigned source_line); 224 const WebKit::WebString& source_name, unsigned source_line);
219 virtual void printPage(WebKit::WebFrame* frame); 225 virtual void printPage(WebKit::WebFrame* frame);
220 virtual WebKit::WebNotificationPresenter* notificationPresenter() { 226 virtual WebKit::WebNotificationPresenter* notificationPresenter() {
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 // Do not delete directly. This class is reference counted. 592 // Do not delete directly. This class is reference counted.
587 virtual ~RenderView(); 593 virtual ~RenderView();
588 594
589 // Initializes this view with the given parent and ID. The |routing_id| can be 595 // Initializes this view with the given parent and ID. The |routing_id| can be
590 // set to 'MSG_ROUTING_NONE' if the true ID is not yet known. In this case, 596 // set to 'MSG_ROUTING_NONE' if the true ID is not yet known. In this case,
591 // CompleteInit must be called later with the true ID. 597 // CompleteInit must be called later with the true ID.
592 void Init(gfx::NativeViewId parent, 598 void Init(gfx::NativeViewId parent,
593 int32 opener_id, 599 int32 opener_id,
594 const RendererPreferences& renderer_prefs, 600 const RendererPreferences& renderer_prefs,
595 SharedRenderViewCounter* counter, 601 SharedRenderViewCounter* counter,
596 int32 routing_id); 602 int32 routing_id,
603 const string16& frame_name);
597 604
598 void UpdateURL(WebKit::WebFrame* frame); 605 void UpdateURL(WebKit::WebFrame* frame);
599 void UpdateTitle(WebKit::WebFrame* frame, const string16& title); 606 void UpdateTitle(WebKit::WebFrame* frame, const string16& title);
600 void UpdateSessionHistory(WebKit::WebFrame* frame); 607 void UpdateSessionHistory(WebKit::WebFrame* frame);
601 608
602 // Update current main frame's encoding and send it to browser window. 609 // Update current main frame's encoding and send it to browser window.
603 // Since we want to let users see the right encoding info from menu 610 // Since we want to let users see the right encoding info from menu
604 // before finishing loading, we call the UpdateEncoding in 611 // before finishing loading, we call the UpdateEncoding in
605 // a) function:DidCommitLoadForFrame. When this function is called, 612 // a) function:DidCommitLoadForFrame. When this function is called,
606 // that means we have got first data. In here we try to get encoding 613 // that means we have got first data. In here we try to get encoding
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 1248
1242 PepperPluginDelegateImpl pepper_delegate_; 1249 PepperPluginDelegateImpl pepper_delegate_;
1243 1250
1244 // The action to take when receiving AutoFill data from the AutoFillManager. 1251 // The action to take when receiving AutoFill data from the AutoFillManager.
1245 AutoFillAction autofill_action_; 1252 AutoFillAction autofill_action_;
1246 1253
1247 DISALLOW_COPY_AND_ASSIGN(RenderView); 1254 DISALLOW_COPY_AND_ASSIGN(RenderView);
1248 }; 1255 };
1249 1256
1250 #endif // CHROME_RENDERER_RENDER_VIEW_H_ 1257 #endif // CHROME_RENDERER_RENDER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698