chrome/browser/instant/instant_controller.cc - Issue 8322005: Crash fix.

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/instant/instant_controller.cc

Issue 8322005: Crash fix. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 9 years, 2 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:

Index: chrome/browser/instant/instant_controller.cc

diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc

index 538fa1c63560a6d62c9fa586403f12bc5b91a8b9..a186a7461ea28357951b90cf8a6597e1efdcab7f 100644

--- a/chrome/browser/instant/instant_controller.cc

+++ b/chrome/browser/instant/instant_controller.cc

@@ -232,8 +232,10 @@ bool InstantController::IsCurrent() {

bool InstantController::PrepareForCommit() {

// If we are not in the HIDDEN field trial, return the status of the preview.

- if (!InstantFieldTrial::IsHiddenExperiment(tab_contents_->profile()))

+ if (!tab_contents_ ||

+ !InstantFieldTrial::IsHiddenExperiment(tab_contents_->profile())) {

return IsCurrent();

+ }

TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(

tab_contents_->profile());

« no previous file with comments | « no previous file | no next file » | no next file with comments »