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

Unified Diff: content/public/test/mock_render_thread.cc

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/public/test/mock_render_thread.cc
diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index a3edec4f850575d9e6eb8acc362f57ff7b5ae5e8..687d7b8951d21a1c7c4f3ad9202bb36d3ae35013 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -23,8 +23,8 @@ MockRenderThread::MockRenderThread()
opener_id_(0),
new_window_routing_id_(0),
new_window_main_frame_routing_id_(0),
- new_frame_routing_id_(0) {
-}
+ new_window_main_frame_widget_routing_id_(0),
+ new_frame_routing_id_(0) {}
MockRenderThread::~MockRenderThread() {
while (!filters_.empty()) {
@@ -208,12 +208,11 @@ void MockRenderThread::OnCreateWidget(int opener_id,
// The View expects to be returned a valid route_id different from its own.
void MockRenderThread::OnCreateWindow(
const ViewHostMsg_CreateWindow_Params& params,
- int* route_id,
- int* main_frame_route_id,
- int64* cloned_session_storage_namespace_id) {
- *route_id = new_window_routing_id_;
- *main_frame_route_id = new_window_main_frame_routing_id_;
- *cloned_session_storage_namespace_id = 0;
+ ViewHostMsg_CreateWindow_Reply* reply) {
+ reply->route_id = new_window_routing_id_;
+ reply->main_frame_route_id = new_window_main_frame_routing_id_;
+ reply->main_frame_widget_route_id = new_window_main_frame_widget_routing_id_;
+ reply->cloned_session_storage_namespace_id = 0;
}
// The Frame expects to be returned a valid route_id different from its own.

Powered by Google App Engine
This is Rietveld 408576698