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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 return main_render_frame_host_; | 309 return main_render_frame_host_; |
310 } | 310 } |
311 void set_main_render_frame_host(TestRenderFrameHost* rfh) { | 311 void set_main_render_frame_host(TestRenderFrameHost* rfh) { |
312 main_render_frame_host_ = rfh; | 312 main_render_frame_host_ = rfh; |
313 } | 313 } |
314 | 314 |
315 // RenderViewHost overrides -------------------------------------------------- | 315 // RenderViewHost overrides -------------------------------------------------- |
316 | 316 |
317 virtual bool CreateRenderView(const base::string16& frame_name, | 317 virtual bool CreateRenderView(const base::string16& frame_name, |
318 int opener_route_id, | 318 int opener_route_id, |
319 int32 max_page_id) OVERRIDE; | 319 int32 max_page_id, |
| 320 bool window_was_created_with_opener) OVERRIDE; |
320 virtual bool IsRenderViewLive() const OVERRIDE; | 321 virtual bool IsRenderViewLive() const OVERRIDE; |
321 virtual bool IsFullscreen() const OVERRIDE; | 322 virtual bool IsFullscreen() const OVERRIDE; |
322 | 323 |
323 private: | 324 private: |
324 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate); | 325 FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate); |
325 | 326 |
326 void SendNavigateWithTransitionAndResponseCode(int page_id, | 327 void SendNavigateWithTransitionAndResponseCode(int page_id, |
327 const GURL& url, | 328 const GURL& url, |
328 PageTransition transition, | 329 PageTransition transition, |
329 int response_code); | 330 int response_code); |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 private: | 383 private: |
383 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> | 384 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> |
384 ScopedSetSupportedScaleFactors; | 385 ScopedSetSupportedScaleFactors; |
385 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; | 386 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; |
386 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); | 387 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); |
387 }; | 388 }; |
388 | 389 |
389 } // namespace content | 390 } // namespace content |
390 | 391 |
391 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ | 392 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
OLD | NEW |