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

Side by Side Diff: content/public/browser/navigation_handle.cc

Issue 2541063002: Revert of Remove about:srcdoc url conversion. (Closed)
Patch Set: 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/browser/navigation_handle.h" 5 #include "content/public/browser/navigation_handle.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "content/browser/frame_host/navigation_handle_impl.h" 9 #include "content/browser/frame_host/navigation_handle_impl.h"
10 #include "content/browser/frame_host/navigator.h" 10 #include "content/browser/frame_host/navigator.h"
(...skipping 15 matching lines...) Expand all
26 const GURL& url, 26 const GURL& url,
27 RenderFrameHost* render_frame_host, 27 RenderFrameHost* render_frame_host,
28 bool committed, 28 bool committed,
29 net::Error error) { 29 net::Error error) {
30 std::unique_ptr<NavigationHandleImpl> handle_impl = 30 std::unique_ptr<NavigationHandleImpl> handle_impl =
31 NavigationHandleImpl::Create( 31 NavigationHandleImpl::Create(
32 url, static_cast<RenderFrameHostImpl*>(render_frame_host) 32 url, static_cast<RenderFrameHostImpl*>(render_frame_host)
33 ->frame_tree_node(), 33 ->frame_tree_node(),
34 true, // is_renderer_initiated 34 true, // is_renderer_initiated
35 false, // is_same_page 35 false, // is_same_page
36 false, // is_srcdoc
36 base::TimeTicks::Now(), 0, 37 base::TimeTicks::Now(), 0,
37 false); // started_from_context_menu 38 false); // started_from_context_menu
38 handle_impl->set_render_frame_host( 39 handle_impl->set_render_frame_host(
39 static_cast<RenderFrameHostImpl*>(render_frame_host)); 40 static_cast<RenderFrameHostImpl*>(render_frame_host));
40 if (error != net::OK) 41 if (error != net::OK)
41 handle_impl->set_net_error_code(error); 42 handle_impl->set_net_error_code(error);
42 if (committed) 43 if (committed)
43 handle_impl->CallDidCommitNavigationForTesting(url); 44 handle_impl->CallDidCommitNavigationForTesting(url);
44 return std::unique_ptr<NavigationHandle>(std::move(handle_impl)); 45 return std::unique_ptr<NavigationHandle>(std::move(handle_impl));
45 } 46 }
46 47
47 } // namespace content 48 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/navigation_handle.h ('k') | content/public/browser/web_contents_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698