Adding notifications for new sync types.

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

 // Copyright (c) 2011 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/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/google/google_util.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/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"
 #include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
 #include "chrome/browser/ui/webui/sync_setup_handler.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 134 matching lines @@
 
 NTPResourceCache::NTPResourceCache(Profile* profile) : profile_(profile) {
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile)));
   registrar_.Add(this, chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED,
                  NotificationService::AllSources());
 
   // Watch for pref changes that cause us to need to invalidate the HTML cache.
   pref_change_registrar_.Init(profile_->GetPrefs());
+  pref_change_registrar_.Add(prefs::kAcknowledgedSyncTypes, this);
   pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
   pref_change_registrar_.Add(prefs::kEnableBookmarkBar, this);
+  pref_change_registrar_.Add(prefs::kHomePageIsNewTabPage, this);
   pref_change_registrar_.Add(prefs::kNTPShownSections, this);
   pref_change_registrar_.Add(prefs::kNTPShownPage, this);
 }
 
 NTPResourceCache::~NTPResourceCache() {}
 
 RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (is_incognito) {
     if (!new_tab_incognito_html_.get())
@@ skipping 22 matching lines @@
 void NTPResourceCache::Observe(int type,
     const NotificationSource& source, const NotificationDetails& details) {
   // Invalidate the cache.
   if (chrome::NOTIFICATION_BROWSER_THEME_CHANGED == type ||
       chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED == type) {
     new_tab_incognito_html_ = NULL;
     new_tab_html_ = NULL;
     new_tab_incognito_css_ = NULL;
     new_tab_css_ = NULL;
   } else if (chrome::NOTIFICATION_PREF_CHANGED == type) {
-    std::string* pref_name = Details<std::string>(details).ptr();
-    if (*pref_name == prefs::kShowBookmarkBar ||
-        *pref_name == prefs::kEnableBookmarkBar ||
-        *pref_name == prefs::kHomePageIsNewTabPage ||
-        *pref_name == prefs::kNTPShownSections ||
-        *pref_name == prefs::kNTPShownPage) {
-      new_tab_incognito_html_ = NULL;
-      new_tab_html_ = NULL;
-    } else {
-      NOTREACHED();
-    }
+    // A change occurred to one of the preferences we care about, so flush the
+    // cache.
+    new_tab_incognito_html_ = NULL;
+    new_tab_html_ = NULL;
   } else {
     NOTREACHED();
   }
 }
 
 void NTPResourceCache::CreateNewTabIncognitoHTML() {
   DictionaryValue localized_strings;
   localized_strings.SetString("title",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE));
   int new_tab_message_ids = IDS_NEW_TAB_OTR_MESSAGE;
@@ skipping 110 matching lines @@
   localized_strings.SetString("applaunchtypewindow",
       l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_WINDOW));
   localized_strings.SetString("applaunchtypefullscreen",
       l10n_util::GetStringUTF16(IDS_APP_CONTEXT_MENU_OPEN_FULLSCREEN));
   localized_strings.SetString("web_store_title",
       l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE));
   localized_strings.SetString("web_store_url",
       GetUrlWithLang(GURL(Extension::ChromeStoreLaunchURL())));
   localized_strings.SetString("syncpromotext",
       l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL));
+  localized_strings.SetString("synclinktext",
+      l10n_util::GetStringUTF16(IDS_SYNC_ADVANCED_OPTIONS));
   localized_strings.SetString("trashLabel",
       l10n_util::GetStringFUTF16(
           IDS_NEW_TAB_TRASH_LABEL,
           l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
 #if defined(OS_CHROMEOS)
   localized_strings.SetString("expandMenu",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_CLOSE_MENU_EXPAND));
 #endif
 
   NewTabPageHandler::GetLocalizedValues(profile_, &localized_strings);
@@ skipping 29 matching lines @@
         "true" : "false");
   } else {
     localized_strings.SetString("customlogo", "false");
   }
 
   // If the user has preferences for a start and end time for a promo from
   // the server, and this promo string exists, set the localized string.
   if (profile_->GetPrefs()->FindPreference(prefs::kNTPPromoStart) &&
       profile_->GetPrefs()->FindPreference(prefs::kNTPPromoEnd) &&
       profile_->GetPrefs()->FindPreference(prefs::kNTPPromoLine) &&
-      PromoResourceServiceUtil::CanShowPromo(profile_)) {
+      PromoResourceServiceUtil::CanShowPromo(profile_) &&
+      InDateRange(profile_->GetPrefs()->GetDouble(prefs::kNTPPromoStart),
+                  profile_->GetPrefs()->GetDouble(prefs::kNTPPromoEnd))) {
     localized_strings.SetString("serverpromo",
-        InDateRange(profile_->GetPrefs()->GetDouble(prefs::kNTPPromoStart),
-                    profile_->GetPrefs()->GetDouble(prefs::kNTPPromoEnd)) ?
-                    profile_->GetPrefs()->GetString(prefs::kNTPPromoLine) :
-                                                    std::string());
+                                profile_->GetPrefs()->GetString(

[Evan Stade, 2011/08/02 00:33:04]

the indentation here is inconsistent with the way you chose to split lines on
L422-423

[Andrew T Wilson (Slow), 2011/08/02 22:07:42]

Done.

+                                    prefs::kNTPPromoLine));
     UserMetrics::RecordAction(UserMetricsAction("NTPPromoShown"));
+  } else {
+    // Not showing a server-provided promo, so check if we need to show a
+    // notification from the sync service instead (don't want to show both).
+    // If no notification is desired, the "syncnotification" attribute is set
+    // to the empty string.
+    if (profile_->HasProfileSyncService()) {
+      localized_strings.SetString("syncnotification",
+          profile_->GetProfileSyncService()->GetSyncNotification());
+    }
   }
 
   // Load the new tab page appropriate for this build
   // Note that some builds (eg. TOUCHUI) don't make use of everything we
   // do here (all of the template data, etc.), but we keep the back end
   // consistent across builds, supporting the union of all NTP front-ends
   // for simplicity.
   std::string full_html;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4)) {
     base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
@@ skipping 149 matching lines @@
           IDR_NEW_TAB_4_THEME_CSS : IDR_NEW_TAB_THEME_CSS;
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           ntp_css_resource_id));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }