OLD | NEW |
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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
303 return main_render_frame_host_; | 303 return main_render_frame_host_; |
304 } | 304 } |
305 void set_main_render_frame_host(TestRenderFrameHost* rfh) { | 305 void set_main_render_frame_host(TestRenderFrameHost* rfh) { |
306 main_render_frame_host_ = rfh; | 306 main_render_frame_host_ = rfh; |
307 } | 307 } |
308 | 308 |
309 // RenderViewHost overrides -------------------------------------------------- | 309 // RenderViewHost overrides -------------------------------------------------- |
310 | 310 |
311 virtual bool CreateRenderView(const base::string16& frame_name, | 311 virtual bool CreateRenderView(const base::string16& frame_name, |
312 int opener_route_id, | 312 int opener_route_id, |
| 313 int proxy_routing_id, |
313 int32 max_page_id, | 314 int32 max_page_id, |
314 bool window_was_created_with_opener) OVERRIDE; | 315 bool window_was_created_with_opener) OVERRIDE; |
315 virtual bool IsRenderViewLive() const OVERRIDE; | 316 virtual bool IsRenderViewLive() const OVERRIDE; |
316 virtual bool IsFullscreen() const OVERRIDE; | 317 virtual bool IsFullscreen() const OVERRIDE; |
317 | 318 |
318 private: | 319 private: |
319 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate); | 320 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate); |
320 | 321 |
321 void SendNavigateWithTransitionAndResponseCode(int page_id, | 322 void SendNavigateWithTransitionAndResponseCode(int page_id, |
322 const GURL& url, | 323 const GURL& url, |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 private: | 378 private: |
378 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> | 379 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> |
379 ScopedSetSupportedScaleFactors; | 380 ScopedSetSupportedScaleFactors; |
380 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; | 381 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; |
381 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); | 382 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); |
382 }; | 383 }; |
383 | 384 |
384 } // namespace content | 385 } // namespace content |
385 | 386 |
386 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ | 387 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
OLD | NEW |