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_WEB_CONTENTS_H_ | 5 #ifndef CONTENT_TEST_TEST_WEB_CONTENTS_H_ |
6 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_ | 6 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_ |
7 | 7 |
8 #include "content/browser/web_contents/web_contents_impl.h" | 8 #include "content/browser/web_contents/web_contents_impl.h" |
9 #include "content/public/test/web_contents_tester.h" | 9 #include "content/public/test/web_contents_tester.h" |
10 #include "content/test/test_render_frame_host.h" | 10 #include "content/test/test_render_frame_host.h" |
(...skipping 30 matching lines...) Expand all Loading... | |
41 void TestDidNavigate(RenderFrameHost* render_frame_host, | 41 void TestDidNavigate(RenderFrameHost* render_frame_host, |
42 int page_id, | 42 int page_id, |
43 const GURL& url, | 43 const GURL& url, |
44 ui::PageTransition transition) override; | 44 ui::PageTransition transition) override; |
45 void TestDidNavigateWithReferrer(RenderFrameHost* render_frame_host, | 45 void TestDidNavigateWithReferrer(RenderFrameHost* render_frame_host, |
46 int page_id, | 46 int page_id, |
47 const GURL& url, | 47 const GURL& url, |
48 const Referrer& referrer, | 48 const Referrer& referrer, |
49 ui::PageTransition transition) override; | 49 ui::PageTransition transition) override; |
50 | 50 |
51 // State accessor. | 51 // True if a cross-site navigation is pending. |
52 bool cross_navigation_pending() { | 52 bool CrossNavigationPending(); |
nasko
2015/04/15 21:12:46
Shouldn't it be CrossSiteNavigationPending, since
Charlie Reis
2015/04/15 21:54:17
Yes, as long as we're updating the name, please fi
clamy
2015/04/16 13:18:36
Done.
| |
53 return GetRenderManager()->cross_navigation_pending_; | |
54 } | |
55 | 53 |
56 // Prevent interaction with views. | 54 // Prevent interaction with views. |
57 bool CreateRenderViewForRenderManager(RenderViewHost* render_view_host, | 55 bool CreateRenderViewForRenderManager(RenderViewHost* render_view_host, |
58 int opener_route_id, | 56 int opener_route_id, |
59 int proxy_routing_id, | 57 int proxy_routing_id, |
60 bool for_main_frame) override; | 58 bool for_main_frame) override; |
61 void UpdateRenderViewSizeForRenderManager() override {} | 59 void UpdateRenderViewSizeForRenderManager() override {} |
62 | 60 |
63 // Returns a clone of this TestWebContents. The returned object is also a | 61 // Returns a clone of this TestWebContents. The returned object is also a |
64 // TestWebContents. The caller owns the returned object. | 62 // TestWebContents. The caller owns the returned object. |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
119 | 117 |
120 // Expectations for arguments of |SetHistoryOffsetAndLength()|. | 118 // Expectations for arguments of |SetHistoryOffsetAndLength()|. |
121 bool expect_set_history_offset_and_length_; | 119 bool expect_set_history_offset_and_length_; |
122 int expect_set_history_offset_and_length_history_offset_; | 120 int expect_set_history_offset_and_length_history_offset_; |
123 int expect_set_history_offset_and_length_history_length_; | 121 int expect_set_history_offset_and_length_history_length_; |
124 }; | 122 }; |
125 | 123 |
126 } // namespace content | 124 } // namespace content |
127 | 125 |
128 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_ | 126 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_ |
OLD | NEW |