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