Clear cache after showing Sync confirmation bubble

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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 158 matching lines @@
 }  // namespace
 
 NTPResourceCache::NTPResourceCache(Profile* profile) : profile_(profile) {
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(profile)));
   registrar_.Add(this, chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NTP4_INTRO_PREF_CHANGED,
                  content::NotificationService::AllSources());
+  registrar_.Add(this, chrome::NTP4_SYNC_PROMO_SHOW_NTP_BUBBLE_CHANGED,
+                 content::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::kSyncAcknowledgedSyncTypes, this);
   pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
   pref_change_registrar_.Add(prefs::kHomePageIsNewTabPage, this);
   pref_change_registrar_.Add(prefs::kNTPShownPage, this);

[Evan Stade, 2011/11/30 03:38:03]

doesn't work to just add kSyncPromoShowNTPBubble here?

[sail, 2011/11/30 05:50:08]

Done.

Ahh, that works great!

 }
 
 NTPResourceCache::~NTPResourceCache() {}
 
 RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (is_incognito) {
     if (!new_tab_incognito_html_.get())
       CreateNewTabIncognitoHTML();
   } else {
@@ skipping 14 matching lines @@
       CreateNewTabCSS();
   }
   return is_incognito ? new_tab_incognito_css_.get()
                       : new_tab_css_.get();
 }
 
 void NTPResourceCache::Observe(int type,
     const content::NotificationSource& source,
     const content::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 ||
-              chrome::NTP4_INTRO_PREF_CHANGED) {
-    // 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();
+  switch (type) {
+    case chrome::NOTIFICATION_BROWSER_THEME_CHANGED:
+    case chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED:
+      new_tab_incognito_html_ = NULL;
+      new_tab_html_ = NULL;
+      new_tab_incognito_css_ = NULL;
+      new_tab_css_ = NULL;
+      break;
+    case chrome::NOTIFICATION_PREF_CHANGED:
+    case chrome::NTP4_INTRO_PREF_CHANGED:
+    case chrome::NTP4_SYNC_PROMO_SHOW_NTP_BUBBLE_CHANGED:
+      // A change occurred to one of the preferences we care about, so flush the
+      // cache.
+      new_tab_incognito_html_ = NULL;
+      new_tab_html_ = NULL;
+      break;
+    default:
+      NOTREACHED();
+      break;
   }
 }
 
 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;
   int new_tab_html_idr = IDR_INCOGNITO_TAB_HTML;
   const char* new_tab_link = kLearnMoreIncognitoUrl;
@@ skipping 339 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);
 }