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

Side by Side Diff: chrome/browser/tab_contents/tab_contents_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
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_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_ 6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 171
172 // Common implementations of some RenderViewHostDelegate::View methods. 172 // Common implementations of some RenderViewHostDelegate::View methods.
173 RenderViewHostDelegateViewHelper delegate_view_helper_; 173 RenderViewHostDelegateViewHelper delegate_view_helper_;
174 174
175 private: 175 private:
176 // We implement these functions on RenderViewHostDelegate::View directly and 176 // We implement these functions on RenderViewHostDelegate::View directly and
177 // do some book-keeping associated with the request. The request is then 177 // do some book-keeping associated with the request. The request is then
178 // forwarded to *Internal which does platform-specific work. 178 // forwarded to *Internal which does platform-specific work.
179 virtual void CreateNewWindow( 179 virtual void CreateNewWindow(
180 int route_id, 180 int route_id,
181 WindowContainerType window_container_type); 181 WindowContainerType window_container_type,
182 const string16& frame_name);
182 virtual void CreateNewWidget(int route_id, WebKit::WebPopupType popup_type); 183 virtual void CreateNewWidget(int route_id, WebKit::WebPopupType popup_type);
183 virtual void ShowCreatedWindow(int route_id, 184 virtual void ShowCreatedWindow(int route_id,
184 WindowOpenDisposition disposition, 185 WindowOpenDisposition disposition,
185 const gfx::Rect& initial_pos, 186 const gfx::Rect& initial_pos,
186 bool user_gesture); 187 bool user_gesture);
187 virtual void ShowCreatedWidget(int route_id, const gfx::Rect& initial_pos); 188 virtual void ShowCreatedWidget(int route_id, const gfx::Rect& initial_pos);
188 189
189 // The TabContents whose contents we display. 190 // The TabContents whose contents we display.
190 TabContents* tab_contents_; 191 TabContents* tab_contents_;
191 192
192 // Tracks created TabContents objects that have not been shown yet. They are 193 // Tracks created TabContents objects that have not been shown yet. They are
193 // identified by the route ID passed to CreateNewWindow. 194 // identified by the route ID passed to CreateNewWindow.
194 typedef std::map<int, TabContents*> PendingContents; 195 typedef std::map<int, TabContents*> PendingContents;
195 PendingContents pending_contents_; 196 PendingContents pending_contents_;
196 197
197 // These maps hold on to the widgets that we created on behalf of the 198 // These maps hold on to the widgets that we created on behalf of the
198 // renderer that haven't shown yet. 199 // renderer that haven't shown yet.
199 typedef std::map<int, RenderWidgetHostView*> PendingWidgetViews; 200 typedef std::map<int, RenderWidgetHostView*> PendingWidgetViews;
200 PendingWidgetViews pending_widget_views_; 201 PendingWidgetViews pending_widget_views_;
201 202
202 DISALLOW_COPY_AND_ASSIGN(TabContentsView); 203 DISALLOW_COPY_AND_ASSIGN(TabContentsView);
203 }; 204 };
204 205
205 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_ 206 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.cc ('k') | chrome/browser/tab_contents/tab_contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698