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

Side by Side Diff: content/test/test_web_contents.h

Issue 1359163005: Remove surface_id from RenderWidget/RenderWidgetHost and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@channel_creation_preempt
Patch Set: fix more tests 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 unified diff | Download patch
« no previous file with comments | « content/test/test_render_view_host_factory.cc ('k') | content/test/test_web_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 private: 116 private:
117 // WebContentsImpl overrides 117 // WebContentsImpl overrides
118 void CreateNewWindow( 118 void CreateNewWindow(
119 SiteInstance* source_site_instance, 119 SiteInstance* source_site_instance,
120 int route_id, 120 int route_id,
121 int main_frame_route_id, 121 int main_frame_route_id,
122 const ViewHostMsg_CreateWindow_Params& params, 122 const ViewHostMsg_CreateWindow_Params& params,
123 SessionStorageNamespace* session_storage_namespace) override; 123 SessionStorageNamespace* session_storage_namespace) override;
124 void CreateNewWidget(int32 render_process_id, 124 void CreateNewWidget(int32 render_process_id,
125 int32 route_id, 125 int32 route_id,
126 int32 surface_id,
127 blink::WebPopupType popup_type) override; 126 blink::WebPopupType popup_type) override;
128 void CreateNewFullscreenWidget(int32 render_process_id, 127 void CreateNewFullscreenWidget(int32 render_process_id,
129 int32 route_id, 128 int32 route_id) override;
130 int32 surface_id) override;
131 void ShowCreatedWindow(int route_id, 129 void ShowCreatedWindow(int route_id,
132 WindowOpenDisposition disposition, 130 WindowOpenDisposition disposition,
133 const gfx::Rect& initial_rect, 131 const gfx::Rect& initial_rect,
134 bool user_gesture) override; 132 bool user_gesture) override;
135 void ShowCreatedWidget(int route_id, const gfx::Rect& initial_rect) override; 133 void ShowCreatedWidget(int route_id, const gfx::Rect& initial_rect) override;
136 void ShowCreatedFullscreenWidget(int route_id) override; 134 void ShowCreatedFullscreenWidget(int route_id) override;
137 void SaveFrameWithHeaders(const GURL& url, 135 void SaveFrameWithHeaders(const GURL& url,
138 const Referrer& referrer, 136 const Referrer& referrer,
139 const std::string& headers) override; 137 const std::string& headers) override;
140 138
141 RenderViewHostDelegateView* delegate_view_override_; 139 RenderViewHostDelegateView* delegate_view_override_;
142 140
143 // Expectations for arguments of |SetHistoryOffsetAndLength()|. 141 // Expectations for arguments of |SetHistoryOffsetAndLength()|.
144 bool expect_set_history_offset_and_length_; 142 bool expect_set_history_offset_and_length_;
145 int expect_set_history_offset_and_length_history_offset_; 143 int expect_set_history_offset_and_length_history_offset_;
146 int expect_set_history_offset_and_length_history_length_; 144 int expect_set_history_offset_and_length_history_length_;
147 std::string save_frame_headers_; 145 std::string save_frame_headers_;
148 }; 146 };
149 147
150 } // namespace content 148 } // namespace content
151 149
152 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_ 150 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_
OLDNEW
« no previous file with comments | « content/test/test_render_view_host_factory.cc ('k') | content/test/test_web_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698