Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(980)

Side by Side Diff: content/public/test/test_navigation_observer.cc

Issue 2494633004: Remove about:srcdoc url conversion. (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/public/test/test_navigation_observer.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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, 52 bool is_error_page) override {
53 bool is_iframe_srcdoc) override {
54 parent_->OnDidStartProvisionalLoad(render_frame_host, validated_url, 53 parent_->OnDidStartProvisionalLoad(render_frame_host, validated_url,
55 is_error_page, is_iframe_srcdoc); 54 is_error_page);
56 } 55 }
57 56
58 void DidFailProvisionalLoad( 57 void DidFailProvisionalLoad(
59 RenderFrameHost* render_frame_host, 58 RenderFrameHost* render_frame_host,
60 const GURL& validated_url, 59 const GURL& validated_url,
61 int error_code, 60 int error_code,
62 const base::string16& error_description, 61 const base::string16& error_description,
63 bool was_ignored_by_handler) override { 62 bool was_ignored_by_handler) override {
64 parent_->OnDidFailProvisionalLoad(render_frame_host, validated_url, 63 parent_->OnDidFailProvisionalLoad(render_frame_host, validated_url,
65 error_code, error_description); 64 error_code, error_description);
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 ++navigations_completed_; 168 ++navigations_completed_;
170 if (navigations_completed_ == number_of_navigations_) { 169 if (navigations_completed_ == number_of_navigations_) {
171 navigation_started_ = false; 170 navigation_started_ = false;
172 message_loop_runner_->Quit(); 171 message_loop_runner_->Quit();
173 } 172 }
174 } 173 }
175 174
176 void TestNavigationObserver::OnDidStartProvisionalLoad( 175 void TestNavigationObserver::OnDidStartProvisionalLoad(
177 RenderFrameHost* render_frame_host, 176 RenderFrameHost* render_frame_host,
178 const GURL& validated_url, 177 const GURL& validated_url,
179 bool is_error_page, 178 bool is_error_page) {
180 bool is_iframe_srcdoc) {
181 last_navigation_succeeded_ = false; 179 last_navigation_succeeded_ = false;
182 } 180 }
183 181
184 void TestNavigationObserver::OnDidFailProvisionalLoad( 182 void TestNavigationObserver::OnDidFailProvisionalLoad(
185 RenderFrameHost* render_frame_host, 183 RenderFrameHost* render_frame_host,
186 const GURL& validated_url, 184 const GURL& validated_url,
187 int error_code, 185 int error_code,
188 const base::string16& error_description) { 186 const base::string16& error_description) {
189 last_navigation_url_ = validated_url; 187 last_navigation_url_ = validated_url;
190 last_navigation_succeeded_ = false; 188 last_navigation_succeeded_ = false;
191 } 189 }
192 190
193 void TestNavigationObserver::OnDidCommitProvisionalLoadForFrame( 191 void TestNavigationObserver::OnDidCommitProvisionalLoadForFrame(
194 RenderFrameHost* render_frame_host, 192 RenderFrameHost* render_frame_host,
195 const GURL& url, 193 const GURL& url,
196 ui::PageTransition transition_type) { 194 ui::PageTransition transition_type) {
197 last_navigation_url_ = url; 195 last_navigation_url_ = url;
198 last_navigation_succeeded_ = true; 196 last_navigation_succeeded_ = true;
199 } 197 }
200 198
201 } // namespace content 199 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/test_navigation_observer.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698