chrome/browser/ui/search/instant_loader.cc - Issue 13877028: Renderer initiated navigations from non instant process should not fall into instant.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/search/instant_loader.cc

Issue 13877028: Renderer initiated navigations from non instant process should not fall into instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixing another recently added test. Created 7 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

« no previous file with comments | « chrome/browser/ui/search/instant_extended_interactive_uitest.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/search/instant_loader.cc

diff --git a/chrome/browser/ui/search/instant_loader.cc b/chrome/browser/ui/search/instant_loader.cc

index 10f3491adc220ac5e6e5ae53da2f9badfc9083c3..2664658d5eacbe452efdd437c5583b27286d2a25 100644

--- a/chrome/browser/ui/search/instant_loader.cc

+++ b/chrome/browser/ui/search/instant_loader.cc

@@ -9,6 +9,7 @@

#include "chrome/browser/favicon/favicon_tab_helper.h"

#include "chrome/browser/history/history_tab_helper.h"

#include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"

+#include "chrome/browser/search/search.h"

#include "chrome/browser/tab_contents/tab_util.h"

#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"

#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"

@@ -48,7 +49,7 @@ void InstantLoader::Init(const GURL& instant_url,

const base::Closure& on_stale_callback) {

content::WebContents::CreateParams create_params(profile);

create_params.site_instance = content::SiteInstance::CreateForURL(

- profile, instant_url);

+ profile, chrome::GetPrivilegedURLForInstant(instant_url, profile));

SetContents(scoped_ptr<content::WebContents>(

content::WebContents::Create(create_params)));

instant_url_ = instant_url;