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

Side by Side Diff: content/public/browser/web_contents.h

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: plumb through surface ID *and* widget surface ID for window.open Created 5 years, 3 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
6 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ 6 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 // If the opener is suppressed, then the new WebContents doesn't hold a 105 // If the opener is suppressed, then the new WebContents doesn't hold a
106 // reference to its opener. 106 // reference to its opener.
107 bool opener_suppressed; 107 bool opener_suppressed;
108 108
109 // Indicates whether this WebContents was created with a window.opener. 109 // Indicates whether this WebContents was created with a window.opener.
110 // This is used when determining whether the WebContents is allowed to be 110 // This is used when determining whether the WebContents is allowed to be
111 // closed via window.close(). This may be true even with a null |opener| 111 // closed via window.close(). This may be true even with a null |opener|
112 // (e.g., for blocked popups). 112 // (e.g., for blocked popups).
113 bool created_with_opener; 113 bool created_with_opener;
114 114
115 // The routing ids of the RenderView and of the main RenderFrame. Either 115 // The routing ids of the RenderView, main RenderFrame, and the widget for
116 // both must be provided, or both must be MSG_ROUTING_NONE to have the 116 // the main RenderFrame. Either all routing IDs must be provided or all must
117 // WebContents make the assignment. 117 // be MSG_ROUTING_NONE to have WebContents make the assignment.
ncarter (slow) 2015/09/03 20:24:37 Maybe the documentation should probably say which
dcheng 2015/09/03 21:29:24 Done, though it's actually for site_instance->GetP
118 int routing_id; 118 int32 routing_id;
119 int main_frame_routing_id; 119 int32 main_frame_routing_id;
120 int32 main_frame_widget_routing_id;
121
122 // The surface ID of the main frame widget.
ncarter (slow) 2015/09/03 20:24:37 Add a comment saying when this must be provided (i
dcheng 2015/09/03 21:29:24 Done.
123 int32 surface_id;
120 124
121 // The name of the top-level frame of the new window. It is non-empty 125 // The name of the top-level frame of the new window. It is non-empty
122 // when creating a named window (e.g. <a target="foo"> or 126 // when creating a named window (e.g. <a target="foo"> or
123 // window.open('', 'bar')). 127 // window.open('', 'bar')).
124 std::string main_frame_name; 128 std::string main_frame_name;
125 129
126 // Initial size of the new WebContent's view. Can be (0, 0) if not needed. 130 // Initial size of the new WebContent's view. Can be (0, 0) if not needed.
127 gfx::Size initial_size; 131 gfx::Size initial_size;
128 132
129 // True if the contents should be initially hidden. 133 // True if the contents should be initially hidden.
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 695
692 private: 696 private:
693 // This interface should only be implemented inside content. 697 // This interface should only be implemented inside content.
694 friend class WebContentsImpl; 698 friend class WebContentsImpl;
695 WebContents() {} 699 WebContents() {}
696 }; 700 };
697 701
698 } // namespace content 702 } // namespace content
699 703
700 #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ 704 #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698