| Index: chrome/browser/ui/webui/ntp/ntp_resource_cache.h
 | 
| diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h
 | 
| index 83bfab24ab1af481837cf7d575f013468629bc83..c8ee03b71df2c5d3a196e182df305d044821bccb 100644
 | 
| --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h
 | 
| +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h
 | 
| @@ -9,7 +9,6 @@
 | 
|  #include "base/compiler_specific.h"
 | 
|  #include "base/memory/ref_counted.h"
 | 
|  #include "base/prefs/public/pref_change_registrar.h"
 | 
| -#include "base/prefs/public/pref_observer.h"
 | 
|  #include "base/string16.h"
 | 
|  #include "chrome/browser/profiles/profile_keyed_service.h"
 | 
|  #include "content/public/browser/notification_observer.h"
 | 
| @@ -24,7 +23,6 @@ class RefCountedMemory;
 | 
|  // This class keeps a cache of NTP resources (HTML and CSS) so we don't have to
 | 
|  // regenerate them all the time.
 | 
|  class NTPResourceCache : public content::NotificationObserver,
 | 
| -                         public PrefObserver,
 | 
|                           public ProfileKeyedService {
 | 
|   public:
 | 
|    explicit NTPResourceCache(Profile* profile);
 | 
| @@ -38,34 +36,34 @@ class NTPResourceCache : public content::NotificationObserver,
 | 
|                         const content::NotificationSource& source,
 | 
|                         const content::NotificationDetails& details) OVERRIDE;
 | 
|  
 | 
| -  // PrefObserver interface.
 | 
| -  virtual void OnPreferenceChanged(PrefServiceBase* service,
 | 
| -                                   const std::string& pref_name) OVERRIDE;
 | 
| -
 | 
|   private:
 | 
| -  Profile* profile_;
 | 
| +  void OnPreferenceChanged();
 | 
|  
 | 
|    void CreateNewTabHTML();
 | 
| -  scoped_refptr<base::RefCountedMemory> new_tab_html_;
 | 
|  
 | 
|    // Helper to determine if the resource cache should be invalidated.
 | 
|    // This is called on every page load, and can be used to check values that
 | 
|    // don't generate a notification when changed (e.g., system preferences).
 | 
|    bool NewTabCacheNeedsRefresh();
 | 
|  
 | 
| +  Profile* profile_;
 | 
| +
 | 
| +  scoped_refptr<base::RefCountedMemory> new_tab_html_;
 | 
| +
 | 
|  #if !defined(OS_ANDROID)
 | 
|    // Returns a message describing any newly-added sync types, or an empty
 | 
|    // string if all types have already been acknowledged.
 | 
|    string16 GetSyncTypeMessage();
 | 
|  
 | 
|    void CreateNewTabIncognitoHTML();
 | 
| -  scoped_refptr<base::RefCountedMemory> new_tab_incognito_html_;
 | 
|  
 | 
|    void CreateNewTabIncognitoCSS();
 | 
| -  scoped_refptr<base::RefCountedMemory> new_tab_incognito_css_;
 | 
| +
 | 
|    void CreateNewTabCSS();
 | 
| -  scoped_refptr<base::RefCountedMemory> new_tab_css_;
 | 
|  
 | 
| +  scoped_refptr<base::RefCountedMemory> new_tab_incognito_html_;
 | 
| +  scoped_refptr<base::RefCountedMemory> new_tab_incognito_css_;
 | 
| +  scoped_refptr<base::RefCountedMemory> new_tab_css_;
 | 
|    content::NotificationRegistrar registrar_;
 | 
|    PrefChangeRegistrar pref_change_registrar_;
 | 
|  #endif
 | 
| 
 |