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

Unified Diff: content/browser/frame_host/navigation_entry_impl.cc

Issue 1104603002: Pick frame to navigate in the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add unit test Created 5 years, 8 months 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_entry_impl.cc
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index 12cafa65da2a8158d7222431ba9735a742405ee5..7e930dc9ec3331eb2686a8f7f7b3b8b22486e4e9 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -313,14 +313,6 @@ bool NavigationEntryImpl::GetCanLoadLocalResources() const {
return can_load_local_resources_;
}
-void NavigationEntryImpl::SetFrameToNavigate(const std::string& frame_name) {
- frame_to_navigate_ = frame_name;
-}
-
-const std::string& NavigationEntryImpl::GetFrameToNavigate() const {
- return frame_to_navigate_;
-}
-
void NavigationEntryImpl::SetExtraData(const std::string& key,
const base::string16& data) {
extra_data_[key] = data;
@@ -378,7 +370,6 @@ NavigationEntryImpl* NavigationEntryImpl::Clone() const {
// ResetForCommit: should_replace_entry_
copy->redirect_chain_ = redirect_chain_;
// ResetForCommit: should_clear_history_list_
- copy->frame_to_navigate_ = frame_to_navigate_;
// ResetForCommit: frame_tree_node_id_
// ResetForCommit: intent_received_timestamp_
copy->extra_data_ = extra_data_;
@@ -444,10 +435,9 @@ RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams(
}
return RequestNavigationParams(
GetIsOverridingUserAgent(), navigation_start, redirects,
- GetCanLoadLocalResources(), GetFrameToNavigate(), base::Time::Now(),
- GetPageState(), GetPageID(), pending_offset_to_send,
- current_offset_to_send, current_length_to_send,
- should_clear_history_list());
+ GetCanLoadLocalResources(), base::Time::Now(), GetPageState(),
+ GetPageID(), pending_offset_to_send, current_offset_to_send,
+ current_length_to_send, should_clear_history_list());
}
void NavigationEntryImpl::ResetForCommit() {

Powered by Google App Engine
This is Rietveld 408576698