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

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: Final version for the record 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
« no previous file with comments | « chrome/renderer/render_thread.cc ('k') | chrome/renderer/render_view.cc » ('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) 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 <queue> 10 #include <queue>
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 // |counter| is either a currently initialized counter, or NULL (in which case 148 // |counter| is either a currently initialized counter, or NULL (in which case
149 // we treat this RenderView as a top level window). 149 // we treat this RenderView as a top level window).
150 static RenderView* Create( 150 static RenderView* Create(
151 RenderThreadBase* render_thread, 151 RenderThreadBase* render_thread,
152 gfx::NativeViewId parent_hwnd, 152 gfx::NativeViewId parent_hwnd,
153 int32 opener_id, 153 int32 opener_id,
154 const RendererPreferences& renderer_prefs, 154 const RendererPreferences& renderer_prefs,
155 const WebPreferences& webkit_prefs, 155 const WebPreferences& webkit_prefs,
156 SharedRenderViewCounter* counter, 156 SharedRenderViewCounter* counter,
157 int32 routing_id, 157 int32 routing_id,
158 int64 session_storage_namespace_id); 158 int64 session_storage_namespace_id,
159 const string16& frame_name);
159 160
160 // Visit all RenderViews with a live WebView (i.e., RenderViews that have 161 // Visit all RenderViews with a live WebView (i.e., RenderViews that have
161 // been closed but not yet destroyed are excluded). 162 // been closed but not yet destroyed are excluded).
162 static void ForEach(RenderViewVisitor* visitor); 163 static void ForEach(RenderViewVisitor* visitor);
163 164
164 // Returns the RenderView containing the given WebView. 165 // Returns the RenderView containing the given WebView.
165 static RenderView* FromWebView(WebKit::WebView* webview); 166 static RenderView* FromWebView(WebKit::WebView* webview);
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);
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 300
300 // WebKit::WebWidgetClient implementation ------------------------------------ 301 // WebKit::WebWidgetClient implementation ------------------------------------
301 302
302 // Most methods are handled by RenderWidget. 303 // Most methods are handled by RenderWidget.
303 virtual void show(WebKit::WebNavigationPolicy policy); 304 virtual void show(WebKit::WebNavigationPolicy policy);
304 virtual void closeWidgetSoon(); 305 virtual void closeWidgetSoon();
305 virtual void runModal(); 306 virtual void runModal();
306 307
307 // WebKit::WebViewClient implementation -------------------------------------- 308 // WebKit::WebViewClient implementation --------------------------------------
308 309
310 // TODO(atwilson): Remove this API when we push related changes upstream
309 virtual WebKit::WebView* createView( 311 virtual WebKit::WebView* createView(
310 WebKit::WebFrame* creator, 312 WebKit::WebFrame* creator,
311 const WebKit::WebWindowFeatures& features); 313 const WebKit::WebWindowFeatures& features);
314 virtual WebKit::WebView* createView(
315 WebKit::WebFrame* creator,
316 const WebKit::WebWindowFeatures& features,
317 const WebKit::WebString& frame_name);
312 virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type); 318 virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type);
313 virtual WebKit::WebWidget* createPopupMenu( 319 virtual WebKit::WebWidget* createPopupMenu(
314 const WebKit::WebPopupMenuInfo& info); 320 const WebKit::WebPopupMenuInfo& info);
315 virtual WebKit::WebStorageNamespace* createSessionStorageNamespace( 321 virtual WebKit::WebStorageNamespace* createSessionStorageNamespace(
316 unsigned quota); 322 unsigned quota);
317 virtual void didAddMessageToConsole( 323 virtual void didAddMessageToConsole(
318 const WebKit::WebConsoleMessage& message, 324 const WebKit::WebConsoleMessage& message,
319 const WebKit::WebString& source_name, 325 const WebKit::WebString& source_name,
320 unsigned source_line); 326 unsigned source_line);
321 virtual void printPage(WebKit::WebFrame* frame); 327 virtual void printPage(WebKit::WebFrame* frame);
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 // Do not delete directly. This class is reference counted. 615 // Do not delete directly. This class is reference counted.
610 virtual ~RenderView(); 616 virtual ~RenderView();
611 617
612 // Initializes this view with the given parent and ID. The |routing_id| can be 618 // Initializes this view with the given parent and ID. The |routing_id| can be
613 // set to 'MSG_ROUTING_NONE' if the true ID is not yet known. In this case, 619 // set to 'MSG_ROUTING_NONE' if the true ID is not yet known. In this case,
614 // CompleteInit must be called later with the true ID. 620 // CompleteInit must be called later with the true ID.
615 void Init(gfx::NativeViewId parent, 621 void Init(gfx::NativeViewId parent,
616 int32 opener_id, 622 int32 opener_id,
617 const RendererPreferences& renderer_prefs, 623 const RendererPreferences& renderer_prefs,
618 SharedRenderViewCounter* counter, 624 SharedRenderViewCounter* counter,
619 int32 routing_id); 625 int32 routing_id,
626 const string16& frame_name);
620 627
621 void UpdateURL(WebKit::WebFrame* frame); 628 void UpdateURL(WebKit::WebFrame* frame);
622 void UpdateTitle(WebKit::WebFrame* frame, const string16& title); 629 void UpdateTitle(WebKit::WebFrame* frame, const string16& title);
623 void UpdateSessionHistory(WebKit::WebFrame* frame); 630 void UpdateSessionHistory(WebKit::WebFrame* frame);
624 631
625 // Update current main frame's encoding and send it to browser window. 632 // Update current main frame's encoding and send it to browser window.
626 // Since we want to let users see the right encoding info from menu 633 // Since we want to let users see the right encoding info from menu
627 // before finishing loading, we call the UpdateEncoding in 634 // before finishing loading, we call the UpdateEncoding in
628 // a) function:DidCommitLoadForFrame. When this function is called, 635 // a) function:DidCommitLoadForFrame. When this function is called,
629 // that means we have got first data. In here we try to get encoding 636 // that means we have got first data. In here we try to get encoding
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
1269 // ADDING NEW DATA? Please see if it fits appropriately in one of the above 1276 // ADDING NEW DATA? Please see if it fits appropriately in one of the above
1270 // sections rather than throwing it randomly at the end. If you're adding a 1277 // sections rather than throwing it randomly at the end. If you're adding a
1271 // bunch of stuff, you should probably create a helper class and put your 1278 // bunch of stuff, you should probably create a helper class and put your
1272 // data and methods on that to avoid bloating RenderView more. 1279 // data and methods on that to avoid bloating RenderView more.
1273 // --------------------------------------------------------------------------- 1280 // ---------------------------------------------------------------------------
1274 1281
1275 DISALLOW_COPY_AND_ASSIGN(RenderView); 1282 DISALLOW_COPY_AND_ASSIGN(RenderView);
1276 }; 1283 };
1277 1284
1278 #endif // CHROME_RENDERER_RENDER_VIEW_H_ 1285 #endif // CHROME_RENDERER_RENDER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/renderer/render_thread.cc ('k') | chrome/renderer/render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698