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

Unified Diff: chrome/browser/instant/instant_loader.cc

Issue 10963018: Rework arguments of HistoryService::AddPage() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Windows compile Created 8 years, 3 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
« no previous file with comments | « chrome/browser/instant/instant_loader.h ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_loader.cc
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index 4da895ad07f0bd99cce0058e3f27bccc9d3a279e..eec479ef930d504cecf5349a708d4c1361432818 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -172,7 +172,7 @@ bool InstantLoader::WebContentsDelegateImpl::OnGoToEntryOffset(int offset) {
bool InstantLoader::WebContentsDelegateImpl::ShouldAddNavigationToHistory(
const history::HistoryAddPageArgs& add_page_args,
content::NavigationType navigation_type) {
- loader_->last_navigation_ = add_page_args.Clone();
+ loader_->last_navigation_ = add_page_args;
return false;
}
@@ -312,7 +312,7 @@ void InstantLoader::Init() {
void InstantLoader::Update(const string16& user_text, bool verbatim) {
// TODO: Support real cursor position.
- last_navigation_ = NULL;
+ last_navigation_ = history::HistoryAddPageArgs();
content::RenderViewHost* rvh =
preview_contents_->web_contents()->GetRenderViewHost();
rvh->Send(new ChromeViewMsg_SearchBoxChange(rvh->GetRoutingID(), user_text,
« no previous file with comments | « chrome/browser/instant/instant_loader.h ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698