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

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

Issue 5023001: Handful of related instant changes: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux build Created 10 years, 1 month 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_confirm_dialog.h ('k') | chrome/browser/instant/instant_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_confirm_dialog.cc
diff --git a/chrome/browser/instant/instant_confirm_dialog.cc b/chrome/browser/instant/instant_confirm_dialog.cc
index 5c6c5356adb2af481c9b8430ee1da8e1b8365bc9..e59a30bd3733cfd3c88bcdba6cf9f399a45fd2ff 100644
--- a/chrome/browser/instant/instant_confirm_dialog.cc
+++ b/chrome/browser/instant/instant_confirm_dialog.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/instant/instant_confirm_dialog.h"
+#include "chrome/browser/instant/instant_controller.h"
+#include "chrome/browser/instant/promo_counter.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profile.h"
#include "chrome/common/pref_names.h"
@@ -19,8 +21,12 @@ void ShowInstantConfirmDialogIfNecessary(gfx::NativeWindow parent,
if (!prefs)
return;
+ PromoCounter* promo_counter = profile->GetInstantPromoCounter();
+ if (promo_counter)
+ promo_counter->Hide();
+
if (prefs->GetBoolean(prefs::kInstantConfirmDialogShown)) {
- prefs->SetBoolean(prefs::kInstantEnabled, true);
+ InstantController::Enable(profile);
return;
}
« no previous file with comments | « chrome/browser/instant/instant_confirm_dialog.h ('k') | chrome/browser/instant/instant_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698