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

Side by Side Diff: content/test/test_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_TEST_TEST_WEB_CONTENTS_H_ 5 #ifndef CONTENT_TEST_TEST_WEB_CONTENTS_H_
6 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_ 6 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "content/browser/web_contents/web_contents_impl.h" 10 #include "content/browser/web_contents/web_contents_impl.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 bool was_ignored_by_handler); 111 bool was_ignored_by_handler);
112 112
113 protected: 113 protected:
114 // The deprecated WebContentsTester still needs to subclass this. 114 // The deprecated WebContentsTester still needs to subclass this.
115 explicit TestWebContents(BrowserContext* browser_context); 115 explicit TestWebContents(BrowserContext* browser_context);
116 116
117 private: 117 private:
118 // WebContentsImpl overrides 118 // WebContentsImpl overrides
119 void CreateNewWindow( 119 void CreateNewWindow(
120 SiteInstance* source_site_instance, 120 SiteInstance* source_site_instance,
121 int route_id, 121 int32 route_id,
122 int main_frame_route_id, 122 int32 main_frame_route_id,
123 int32 main_frame_widget_route_id,
124 int32 surface_id,
123 const ViewHostMsg_CreateWindow_Params& params, 125 const ViewHostMsg_CreateWindow_Params& params,
124 SessionStorageNamespace* session_storage_namespace) override; 126 SessionStorageNamespace* session_storage_namespace) override;
125 void CreateNewWidget(int32 render_process_id, 127 void CreateNewWidget(int32 render_process_id,
126 int32 route_id, 128 int32 route_id,
127 int32 surface_id, 129 int32 surface_id,
128 blink::WebPopupType popup_type) override; 130 blink::WebPopupType popup_type) override;
129 void CreateNewFullscreenWidget(int32 render_process_id, 131 void CreateNewFullscreenWidget(int32 render_process_id,
130 int32 route_id, 132 int32 route_id,
131 int32 surface_id) override; 133 int32 surface_id) override;
132 void ShowCreatedWindow(int route_id, 134 void ShowCreatedWindow(int route_id,
(...skipping 11 matching lines...) Expand all
144 // Expectations for arguments of |SetHistoryOffsetAndLength()|. 146 // Expectations for arguments of |SetHistoryOffsetAndLength()|.
145 bool expect_set_history_offset_and_length_; 147 bool expect_set_history_offset_and_length_;
146 int expect_set_history_offset_and_length_history_offset_; 148 int expect_set_history_offset_and_length_history_offset_;
147 int expect_set_history_offset_and_length_history_length_; 149 int expect_set_history_offset_and_length_history_length_;
148 std::string save_frame_headers_; 150 std::string save_frame_headers_;
149 }; 151 };
150 152
151 } // namespace content 153 } // namespace content
152 154
153 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_ 155 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698