| Index: chrome/renderer/render_view.h
|
| diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
|
| index 01de29b66fc561ffe470dc0d22de6b9fd85110e5..2f2be36266bed16188dd2188e0efd954d7e69b60 100644
|
| --- a/chrome/renderer/render_view.h
|
| +++ b/chrome/renderer/render_view.h
|
| @@ -162,7 +162,8 @@ class RenderView : public RenderWidget,
|
| const WebPreferences& webkit_prefs,
|
| SharedRenderViewCounter* counter,
|
| int32 routing_id,
|
| - int64 session_storage_namespace_id);
|
| + int64 session_storage_namespace_id,
|
| + const string16& frame_name);
|
|
|
| // Sets the "next page id" counter.
|
| static void SetNextPageID(int32 next_page_id);
|
| @@ -205,9 +206,14 @@ class RenderView : public RenderWidget,
|
| virtual void DnsPrefetch(const std::vector<std::string>& host_names);
|
|
|
| // WebKit::WebViewClient
|
| + // TODO(atwilson): Remove this API when we push related changes upstream
|
| virtual WebKit::WebView* createView(
|
| WebKit::WebFrame* creator,
|
| const WebKit::WebWindowFeatures& features);
|
| + virtual WebKit::WebView* createView(
|
| + WebKit::WebFrame* creator,
|
| + const WebKit::WebWindowFeatures& features,
|
| + const WebKit::WebString& frame_name);
|
| virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type);
|
| virtual WebKit::WebWidget* createPopupMenu(
|
| const WebKit::WebPopupMenuInfo& info);
|
| @@ -593,7 +599,8 @@ class RenderView : public RenderWidget,
|
| int32 opener_id,
|
| const RendererPreferences& renderer_prefs,
|
| SharedRenderViewCounter* counter,
|
| - int32 routing_id);
|
| + int32 routing_id,
|
| + const string16& frame_name);
|
|
|
| void UpdateURL(WebKit::WebFrame* frame);
|
| void UpdateTitle(WebKit::WebFrame* frame, const string16& title);
|
|
|