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 #include "content/public/test/test_navigation_observer.h" | 5 #include "content/public/test/test_navigation_observer.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 void DidStartLoading() override { | 42 void DidStartLoading() override { |
43 parent_->OnDidStartLoading(web_contents()); | 43 parent_->OnDidStartLoading(web_contents()); |
44 } | 44 } |
45 | 45 |
46 void DidStopLoading() override { | 46 void DidStopLoading() override { |
47 parent_->OnDidStopLoading(web_contents()); | 47 parent_->OnDidStopLoading(web_contents()); |
48 } | 48 } |
49 | 49 |
50 void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host, | 50 void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host, |
51 const GURL& validated_url, | 51 const GURL& validated_url, |
52 bool is_error_page) override { | 52 bool is_error_page, |
| 53 bool is_iframe_srcdoc) override { |
53 parent_->OnDidStartProvisionalLoad(render_frame_host, validated_url, | 54 parent_->OnDidStartProvisionalLoad(render_frame_host, validated_url, |
54 is_error_page); | 55 is_error_page, is_iframe_srcdoc); |
55 } | 56 } |
56 | 57 |
57 void DidFailProvisionalLoad( | 58 void DidFailProvisionalLoad( |
58 RenderFrameHost* render_frame_host, | 59 RenderFrameHost* render_frame_host, |
59 const GURL& validated_url, | 60 const GURL& validated_url, |
60 int error_code, | 61 int error_code, |
61 const base::string16& error_description, | 62 const base::string16& error_description, |
62 bool was_ignored_by_handler) override { | 63 bool was_ignored_by_handler) override { |
63 parent_->OnDidFailProvisionalLoad(render_frame_host, validated_url, | 64 parent_->OnDidFailProvisionalLoad(render_frame_host, validated_url, |
64 error_code, error_description); | 65 error_code, error_description); |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 ++navigations_completed_; | 169 ++navigations_completed_; |
169 if (navigations_completed_ == number_of_navigations_) { | 170 if (navigations_completed_ == number_of_navigations_) { |
170 navigation_started_ = false; | 171 navigation_started_ = false; |
171 message_loop_runner_->Quit(); | 172 message_loop_runner_->Quit(); |
172 } | 173 } |
173 } | 174 } |
174 | 175 |
175 void TestNavigationObserver::OnDidStartProvisionalLoad( | 176 void TestNavigationObserver::OnDidStartProvisionalLoad( |
176 RenderFrameHost* render_frame_host, | 177 RenderFrameHost* render_frame_host, |
177 const GURL& validated_url, | 178 const GURL& validated_url, |
178 bool is_error_page) { | 179 bool is_error_page, |
| 180 bool is_iframe_srcdoc) { |
179 last_navigation_succeeded_ = false; | 181 last_navigation_succeeded_ = false; |
180 } | 182 } |
181 | 183 |
182 void TestNavigationObserver::OnDidFailProvisionalLoad( | 184 void TestNavigationObserver::OnDidFailProvisionalLoad( |
183 RenderFrameHost* render_frame_host, | 185 RenderFrameHost* render_frame_host, |
184 const GURL& validated_url, | 186 const GURL& validated_url, |
185 int error_code, | 187 int error_code, |
186 const base::string16& error_description) { | 188 const base::string16& error_description) { |
187 last_navigation_url_ = validated_url; | 189 last_navigation_url_ = validated_url; |
188 last_navigation_succeeded_ = false; | 190 last_navigation_succeeded_ = false; |
189 } | 191 } |
190 | 192 |
191 void TestNavigationObserver::OnDidCommitProvisionalLoadForFrame( | 193 void TestNavigationObserver::OnDidCommitProvisionalLoadForFrame( |
192 RenderFrameHost* render_frame_host, | 194 RenderFrameHost* render_frame_host, |
193 const GURL& url, | 195 const GURL& url, |
194 ui::PageTransition transition_type) { | 196 ui::PageTransition transition_type) { |
195 last_navigation_url_ = url; | 197 last_navigation_url_ = url; |
196 last_navigation_succeeded_ = true; | 198 last_navigation_succeeded_ = true; |
197 } | 199 } |
198 | 200 |
199 } // namespace content | 201 } // namespace content |
OLD | NEW |