OLD | NEW |
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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 // If the opener is suppressed, then the new WebContents doesn't hold a | 106 // If the opener is suppressed, then the new WebContents doesn't hold a |
107 // reference to its opener. | 107 // reference to its opener. |
108 bool opener_suppressed; | 108 bool opener_suppressed; |
109 | 109 |
110 // Indicates whether this WebContents was created with a window.opener. | 110 // Indicates whether this WebContents was created with a window.opener. |
111 // This is used when determining whether the WebContents is allowed to be | 111 // This is used when determining whether the WebContents is allowed to be |
112 // closed via window.close(). This may be true even with a null |opener| | 112 // closed via window.close(). This may be true even with a null |opener| |
113 // (e.g., for blocked popups). | 113 // (e.g., for blocked popups). |
114 bool created_with_opener; | 114 bool created_with_opener; |
115 | 115 |
116 // The routing ids of the RenderView and of the main RenderFrame. Either | 116 // The routing ids of the RenderView, main RenderFrame, and the widget for |
117 // both must be provided, or both must be MSG_ROUTING_NONE to have the | 117 // the main RenderFrame. Either all routing IDs must be provided or all must |
118 // WebContents make the assignment. | 118 // be MSG_ROUTING_NONE to have WebContents make the assignment. If provided, |
119 int routing_id; | 119 // these routing IDs are associated with |site_instance->GetProcess()|. |
120 int main_frame_routing_id; | 120 int32_t routing_id; |
| 121 int32_t main_frame_routing_id; |
| 122 int32_t main_frame_widget_routing_id; |
121 | 123 |
122 // The name of the top-level frame of the new window. It is non-empty | 124 // The name of the top-level frame of the new window. It is non-empty |
123 // when creating a named window (e.g. <a target="foo"> or | 125 // when creating a named window (e.g. <a target="foo"> or |
124 // window.open('', 'bar')). | 126 // window.open('', 'bar')). |
125 std::string main_frame_name; | 127 std::string main_frame_name; |
126 | 128 |
127 // Initial size of the new WebContent's view. Can be (0, 0) if not needed. | 129 // Initial size of the new WebContent's view. Can be (0, 0) if not needed. |
128 gfx::Size initial_size; | 130 gfx::Size initial_size; |
129 | 131 |
130 // True if the contents should be initially hidden. | 132 // True if the contents should be initially hidden. |
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
701 | 703 |
702 private: | 704 private: |
703 // This interface should only be implemented inside content. | 705 // This interface should only be implemented inside content. |
704 friend class WebContentsImpl; | 706 friend class WebContentsImpl; |
705 WebContents() {} | 707 WebContents() {} |
706 }; | 708 }; |
707 | 709 |
708 } // namespace content | 710 } // namespace content |
709 | 711 |
710 #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ | 712 #endif // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_ |
OLD | NEW |