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

Side by Side Diff: content/test/test_render_view_host.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, 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
« no previous file with comments | « content/test/test_render_frame_host_factory.cc ('k') | content/test/test_render_view_host.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_RENDER_VIEW_HOST_H_ 5 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 // the split interface we avoid complexity within content and maintain 199 // the split interface we avoid complexity within content and maintain
200 // reasonable utility for embedders. 200 // reasonable utility for embedders.
201 class TestRenderViewHost 201 class TestRenderViewHost
202 : public RenderViewHostImpl, 202 : public RenderViewHostImpl,
203 public RenderViewHostTester { 203 public RenderViewHostTester {
204 public: 204 public:
205 TestRenderViewHost(SiteInstance* instance, 205 TestRenderViewHost(SiteInstance* instance,
206 RenderViewHostDelegate* delegate, 206 RenderViewHostDelegate* delegate,
207 RenderWidgetHostDelegate* widget_delegate, 207 RenderWidgetHostDelegate* widget_delegate,
208 int32 routing_id, 208 int32 routing_id,
209 int32 surface_id,
210 int32 main_frame_routing_id, 209 int32 main_frame_routing_id,
211 bool swapped_out); 210 bool swapped_out);
212 ~TestRenderViewHost() override; 211 ~TestRenderViewHost() override;
213 212
214 // RenderViewHostTester implementation. Note that CreateRenderView 213 // RenderViewHostTester implementation. Note that CreateRenderView
215 // is not specified since it is synonymous with the one from 214 // is not specified since it is synonymous with the one from
216 // RenderViewHostImpl, see below. 215 // RenderViewHostImpl, see below.
217 void SimulateWasHidden() override; 216 void SimulateWasHidden() override;
218 void SimulateWasShown() override; 217 void SimulateWasShown() override;
219 WebPreferences TestComputeWebkitPrefs() override; 218 WebPreferences TestComputeWebkitPrefs() override;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 private: 322 private:
324 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> 323 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
325 ScopedSetSupportedScaleFactors; 324 ScopedSetSupportedScaleFactors;
326 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; 325 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
327 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); 326 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
328 }; 327 };
329 328
330 } // namespace content 329 } // namespace content
331 330
332 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 331 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
OLDNEW
« no previous file with comments | « content/test/test_render_frame_host_factory.cc ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698