[NTP4] Fix theme and bookmarks bar notifications.

chrome/browser/ui/webui/ntp/ntp_resource_cache.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/ntp_resource_cache.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 187 matching lines @@
 
 RefCountedMemory* NTPResourceCache::GetNewTabHTML(bool is_incognito) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (is_incognito) {
     if (!new_tab_incognito_html_.get())
       CreateNewTabIncognitoHTML();
   } else {
     if (!new_tab_html_.get())
       CreateNewTabHTML();
   }
-  return is_incognito ? new_tab_incognito_html_.get()
-                      : new_tab_html_.get();
+  return is_incognito ? new_tab_incognito_html_.get() :

[Dan Beam, 2012/03/27 10:30:13]

tell me if this is not right thing to do or if you prefer I didn't (just noticed
while I was in code)

+                        new_tab_html_.get();
 }
 
 RefCountedMemory* NTPResourceCache::GetNewTabCSS(bool is_incognito) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (is_incognito) {
     if (!new_tab_incognito_css_.get())
       CreateNewTabIncognitoCSS();
   } else {
     if (!new_tab_css_.get())
       CreateNewTabCSS();
   }
-  return is_incognito ? new_tab_incognito_css_.get()
-                      : new_tab_css_.get();
+  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;
@@ skipping 309 matching lines @@
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_TAB_4_THEME_CSS));
 
   // 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);
 }