Merge 142914 - Remove NTP4 intro bubble

chrome/browser/ui/webui/ntp/new_tab_page_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/web_resource/notification_promo.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-static const int kIntroDisplayMax = 10;
-
-// The URL of a knowledge-base article about the new NTP.
-static const char kNtp4IntroURL[] =
-    "http://www.google.com/support/chrome/bin/answer.py?answer=95451";
-
 static const char kDefaultPageTypeHistogram[] =
     "NewTabPage.DefaultPageType";
 
 NewTabPageHandler::NewTabPageHandler() : page_switch_count_(0) {
 }
 
 NewTabPageHandler::~NewTabPageHandler() {
   HISTOGRAM_COUNTS_100("NewTabPage.SingleSessionPageSwitches",
                        page_switch_count_);
 }
@@ skipping 17 matching lines @@
 
   web_ui()->RegisterMessageCallback("closeNotificationPromo",
       base::Bind(&NewTabPageHandler::HandleCloseNotificationPromo,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("notificationPromoViewed",
       base::Bind(&NewTabPageHandler::HandleNotificationPromoViewed,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("pageSelected",
       base::Bind(&NewTabPageHandler::HandlePageSelected,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("introMessageDismissed",
-      base::Bind(&NewTabPageHandler::HandleIntroMessageDismissed,
-                 base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("introMessageSeen",
-      base::Bind(&NewTabPageHandler::HandleIntroMessageSeen,
-                 base::Unretained(this)));
 }
 
 void NewTabPageHandler::HandleCloseNotificationPromo(const ListValue* args) {
   NotificationPromo notification_promo(Profile::FromWebUI(web_ui()));
   notification_promo.HandleClosed();
   Notify(chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED);
 }
 
 void NewTabPageHandler::HandleNotificationPromoViewed(const ListValue* args) {
   NotificationPromo notification_promo(Profile::FromWebUI(web_ui()));
@@ skipping 27 matching lines @@
   static bool default_apps_trial_exists =
       base::FieldTrialList::TrialExists(kDefaultAppsTrialName);
   if (default_apps_trial_exists) {
     UMA_HISTOGRAM_ENUMERATION(
         base::FieldTrial::MakeName("NewTabPage.SelectedPageType",
                                    kDefaultAppsTrialName),
         shown_page_type, kHistogramEnumerationMax);
   }
 }
 
-void NewTabPageHandler::HandleIntroMessageDismissed(const ListValue* args) {
-  PrefService* prefs = g_browser_process->local_state();
-  prefs->SetInteger(prefs::kNtp4IntroDisplayCount, kIntroDisplayMax + 1);
-  Notify(chrome::NTP4_INTRO_PREF_CHANGED);
-}
-
-void NewTabPageHandler::HandleIntroMessageSeen(const ListValue* args) {
-  PrefService* prefs = g_browser_process->local_state();
-  int intro_displays = prefs->GetInteger(prefs::kNtp4IntroDisplayCount);
-  prefs->SetInteger(prefs::kNtp4IntroDisplayCount, intro_displays + 1);
-  Notify(chrome::NTP4_INTRO_PREF_CHANGED);
-}
-
 // static
 void NewTabPageHandler::RegisterUserPrefs(PrefService* prefs) {
   // TODO(estade): should be syncable.
   prefs->RegisterIntegerPref(prefs::kNtpShownPage, APPS_PAGE_ID,
                              PrefService::UNSYNCABLE_PREF);
 }
 
 // static
-void NewTabPageHandler::RegisterPrefs(PrefService* prefs) {
-  prefs->RegisterIntegerPref(prefs::kNtp4IntroDisplayCount, 0,
-                             PrefService::UNSYNCABLE_PREF);
-}
-
-// static
 void NewTabPageHandler::GetLocalizedValues(Profile* profile,
                                            DictionaryValue* values) {
   values->SetInteger("most_visited_page_id", MOST_VISITED_PAGE_ID);
   values->SetInteger("apps_page_id", APPS_PAGE_ID);
   values->SetInteger("suggestions_page_id", SUGGESTIONS_PAGE_ID);
 
   PrefService* prefs = profile->GetPrefs();
   int shown_page = prefs->GetInteger(prefs::kNtpShownPage);
   values->SetInteger("shown_page_type", shown_page & ~INDEX_MASK);
   values->SetInteger("shown_page_index", shown_page & INDEX_MASK);
-
-#if !defined(USE_AURA)
-  // Only show intro bubble for non-aura build.
-
-  PrefService* local_state = g_browser_process->local_state();
-  int intro_displays = local_state->GetInteger(prefs::kNtp4IntroDisplayCount);
-  // This preference used to exist in profile, so check the profile if it has
-  // not been set in local state yet.
-  if (!intro_displays) {
-    prefs->RegisterIntegerPref(prefs::kNtp4IntroDisplayCount, 0,
-                               PrefService::UNSYNCABLE_PREF);
-    intro_displays = prefs->GetInteger(prefs::kNtp4IntroDisplayCount);
-    if (intro_displays)
-      local_state->SetInteger(prefs::kNtp4IntroDisplayCount, intro_displays);
-  }
-  if (intro_displays <= kIntroDisplayMax) {
-    values->SetString("ntp4_intro_message",
-                      l10n_util::GetStringUTF16(IDS_NTP4_INTRO_MESSAGE));
-    values->SetString("ntp4_intro_url", kNtp4IntroURL);
-  }
-#endif
-}
-
-// static
-void NewTabPageHandler::DismissIntroMessage(PrefService* prefs) {
-  prefs->SetInteger(prefs::kNtp4IntroDisplayCount, kIntroDisplayMax + 1);
-  // No need to send notification to update resource cache, because this method
-  // is only called during startup before the ntp resource cache is constructed.
 }
 
 void NewTabPageHandler::Notify(chrome::NotificationType notification_type) {
   content::NotificationService* service =
       content::NotificationService::current();
   service->Notify(notification_type,
                   content::Source<NewTabPageHandler>(this),
                   content::NotificationService::NoDetails());
 }