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