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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1212363002: Pass explicitly the frame to HistoryController::GoToEntry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « content/renderer/history_controller.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 4432 matching lines...) Expand 10 before | Expand all | Expand 10 after
4443 if (!browser_side_navigation) { 4443 if (!browser_side_navigation) {
4444 scoped_ptr<NavigationParams> navigation_params( 4444 scoped_ptr<NavigationParams> navigation_params(
4445 new NavigationParams(*pending_navigation_params_.get())); 4445 new NavigationParams(*pending_navigation_params_.get()));
4446 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( 4446 if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
4447 switches::kSitePerProcess)) { 4447 switches::kSitePerProcess)) {
4448 // By default, tell the HistoryController to go the deserialized 4448 // By default, tell the HistoryController to go the deserialized
4449 // HistoryEntry. This only works if all frames are in the same 4449 // HistoryEntry. This only works if all frames are in the same
4450 // process. 4450 // process.
4451 DCHECK(!frame_->parent()); 4451 DCHECK(!frame_->parent());
4452 render_view_->history_controller()->GoToEntry( 4452 render_view_->history_controller()->GoToEntry(
4453 entry.Pass(), navigation_params.Pass(), cache_policy); 4453 frame_, entry.Pass(), navigation_params.Pass(), cache_policy);
4454 } else { 4454 } else {
4455 // In --site-per-process, the browser process sends a single 4455 // In --site-per-process, the browser process sends a single
4456 // WebHistoryItem destined for this frame. 4456 // WebHistoryItem destined for this frame.
4457 // TODO(creis): Change PageState to FrameState. In the meantime, we 4457 // TODO(creis): Change PageState to FrameState. In the meantime, we
4458 // store the relevant frame's WebHistoryItem in the root of the 4458 // store the relevant frame's WebHistoryItem in the root of the
4459 // PageState. 4459 // PageState.
4460 SetPendingNavigationParams(navigation_params.Pass()); 4460 SetPendingNavigationParams(navigation_params.Pass());
4461 blink::WebHistoryItem history_item = entry->root(); 4461 blink::WebHistoryItem history_item = entry->root();
4462 blink::WebHistoryLoadType load_type = 4462 blink::WebHistoryLoadType load_type =
4463 request_params.is_same_document_history_load 4463 request_params.is_same_document_history_load
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
4970 #elif defined(ENABLE_BROWSER_CDMS) 4970 #elif defined(ENABLE_BROWSER_CDMS)
4971 cdm_manager_, 4971 cdm_manager_,
4972 #endif 4972 #endif
4973 this); 4973 this);
4974 } 4974 }
4975 4975
4976 return cdm_factory_; 4976 return cdm_factory_;
4977 } 4977 }
4978 4978
4979 } // namespace content 4979 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/history_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698