summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/instant/instant_confirm_dialog.cc1
-rw-r--r--chrome/browser/instant/instant_confirm_dialog.h4
-rw-r--r--chrome/browser/views/instant_confirm_view.cc4
3 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/instant/instant_confirm_dialog.cc b/chrome/browser/instant/instant_confirm_dialog.cc
index 680cdf3..ad7a396 100644
--- a/chrome/browser/instant/instant_confirm_dialog.cc
+++ b/chrome/browser/instant/instant_confirm_dialog.cc
@@ -24,7 +24,6 @@ void ShowInstantConfirmDialogIfNecessary(gfx::NativeWindow parent,
return;
}
- prefs->SetBoolean(prefs::kInstantConfirmDialogShown, true);
ShowInstantConfirmDialog(parent, profile);
}
diff --git a/chrome/browser/instant/instant_confirm_dialog.h b/chrome/browser/instant/instant_confirm_dialog.h
index 54daaf5..434d65a 100644
--- a/chrome/browser/instant/instant_confirm_dialog.h
+++ b/chrome/browser/instant/instant_confirm_dialog.h
@@ -22,7 +22,9 @@ void ShowInstantConfirmDialogIfNecessary(gfx::NativeWindow parent,
Profile* profile);
// Shows the platform specific dialog to confirm if the user really wants to
-// enable opt-in.
+// enable instant. If the user accepts the dialog implementations must set
+// both |prefs::kInstantEnabled| and |prefs::kInstantConfirmDialogShown| to
+// true.
void ShowInstantConfirmDialog(gfx::NativeWindow parent,
Profile* profile);
diff --git a/chrome/browser/views/instant_confirm_view.cc b/chrome/browser/views/instant_confirm_view.cc
index 02ac089..4a714b2f 100644
--- a/chrome/browser/views/instant_confirm_view.cc
+++ b/chrome/browser/views/instant_confirm_view.cc
@@ -49,8 +49,10 @@ bool InstantConfirmView::Accept(bool window_closing) {
bool InstantConfirmView::Accept() {
PrefService* prefs = profile_->GetPrefs();
- if (prefs)
+ if (prefs) {
prefs->SetBoolean(prefs::kInstantEnabled, true);
+ prefs->SetBoolean(prefs::kInstantConfirmDialogShown, true);
+ }
return true;
}