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

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

Issue 8294017: Merge 105858 - Crash fix. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/911/src/
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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_controller.cc
===================================================================
--- chrome/browser/instant/instant_controller.cc (revision 105860)
+++ chrome/browser/instant/instant_controller.cc (working copy)
@@ -232,8 +232,10 @@
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 »

Powered by Google App Engine
This is Rietveld 408576698