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

Side by Side Diff: content/browser/frame_host/navigation_controller_impl.cc

Issue 743773003: OOPIF: Data URLs are now rendered in the renderer that initiated the navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing android compile Created 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/frame_host/navigation_controller_impl.h" 5 #include "content/browser/frame_host/navigation_controller_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 NavigationEntryImpl* entry = NavigationEntryImpl::FromNavigationEntry( 714 NavigationEntryImpl* entry = NavigationEntryImpl::FromNavigationEntry(
715 CreateNavigationEntry( 715 CreateNavigationEntry(
716 params.url, 716 params.url,
717 params.referrer, 717 params.referrer,
718 params.transition_type, 718 params.transition_type,
719 params.is_renderer_initiated, 719 params.is_renderer_initiated,
720 params.extra_headers, 720 params.extra_headers,
721 browser_context_)); 721 browser_context_));
722 if (params.frame_tree_node_id != -1) 722 if (params.frame_tree_node_id != -1)
723 entry->set_frame_tree_node_id(params.frame_tree_node_id); 723 entry->set_frame_tree_node_id(params.frame_tree_node_id);
724 entry->set_source_site_instance(
725 static_cast<SiteInstanceImpl*>(params.source_site_instance.get()));
724 if (params.redirect_chain.size() > 0) 726 if (params.redirect_chain.size() > 0)
725 entry->SetRedirectChain(params.redirect_chain); 727 entry->SetRedirectChain(params.redirect_chain);
726 if (params.should_replace_current_entry) 728 if (params.should_replace_current_entry)
727 entry->set_should_replace_entry(true); 729 entry->set_should_replace_entry(true);
728 entry->set_should_clear_history_list(params.should_clear_history_list); 730 entry->set_should_clear_history_list(params.should_clear_history_list);
729 entry->SetIsOverridingUserAgent(override); 731 entry->SetIsOverridingUserAgent(override);
730 entry->set_transferred_global_request_id( 732 entry->set_transferred_global_request_id(
731 params.transferred_global_request_id); 733 params.transferred_global_request_id);
732 entry->SetFrameToNavigate(params.frame_name); 734 entry->SetFrameToNavigate(params.frame_name);
733 735
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1770 } 1772 }
1771 } 1773 }
1772 } 1774 }
1773 1775
1774 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 1776 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
1775 const base::Callback<base::Time()>& get_timestamp_callback) { 1777 const base::Callback<base::Time()>& get_timestamp_callback) {
1776 get_timestamp_callback_ = get_timestamp_callback; 1778 get_timestamp_callback_ = get_timestamp_callback;
1777 } 1779 }
1778 1780
1779 } // namespace content 1781 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | content/browser/frame_host/navigation_entry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698