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

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: Fix merge conflicts Created 5 years, 1 month 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 bool was_ignored_by_handler); 110 bool was_ignored_by_handler);
111 111
112 protected: 112 protected:
113 // The deprecated WebContentsTester still needs to subclass this. 113 // The deprecated WebContentsTester still needs to subclass this.
114 explicit TestWebContents(BrowserContext* browser_context); 114 explicit TestWebContents(BrowserContext* browser_context);
115 115
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 int32_t route_id,
121 int main_frame_route_id, 121 int32_t main_frame_route_id,
122 int32_t main_frame_widget_route_id,
122 const ViewHostMsg_CreateWindow_Params& params, 123 const ViewHostMsg_CreateWindow_Params& params,
123 SessionStorageNamespace* session_storage_namespace) override; 124 SessionStorageNamespace* session_storage_namespace) override;
124 void CreateNewWidget(int32 render_process_id, 125 void CreateNewWidget(int32 render_process_id,
125 int32 route_id, 126 int32 route_id,
126 blink::WebPopupType popup_type) override; 127 blink::WebPopupType popup_type) override;
127 void CreateNewFullscreenWidget(int32 render_process_id, 128 void CreateNewFullscreenWidget(int32 render_process_id,
128 int32 route_id) override; 129 int32 route_id) override;
129 void ShowCreatedWindow(int route_id, 130 void ShowCreatedWindow(int route_id,
130 WindowOpenDisposition disposition, 131 WindowOpenDisposition disposition,
131 const gfx::Rect& initial_rect, 132 const gfx::Rect& initial_rect,
132 bool user_gesture) override; 133 bool user_gesture) override;
133 void ShowCreatedWidget(int route_id, const gfx::Rect& initial_rect) override; 134 void ShowCreatedWidget(int route_id, const gfx::Rect& initial_rect) override;
134 void ShowCreatedFullscreenWidget(int route_id) override; 135 void ShowCreatedFullscreenWidget(int route_id) override;
135 void SaveFrameWithHeaders(const GURL& url, 136 void SaveFrameWithHeaders(const GURL& url,
136 const Referrer& referrer, 137 const Referrer& referrer,
137 const std::string& headers) override; 138 const std::string& headers) override;
138 139
139 RenderViewHostDelegateView* delegate_view_override_; 140 RenderViewHostDelegateView* delegate_view_override_;
140 141
141 // Expectations for arguments of |SetHistoryOffsetAndLength()|. 142 // Expectations for arguments of |SetHistoryOffsetAndLength()|.
142 bool expect_set_history_offset_and_length_; 143 bool expect_set_history_offset_and_length_;
143 int expect_set_history_offset_and_length_history_offset_; 144 int expect_set_history_offset_and_length_history_offset_;
144 int expect_set_history_offset_and_length_history_length_; 145 int expect_set_history_offset_and_length_history_length_;
145 std::string save_frame_headers_; 146 std::string save_frame_headers_;
146 }; 147 };
147 148
148 } // namespace content 149 } // namespace content
149 150
150 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_ 151 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698