diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /chrome/browser/profile_impl.h | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'chrome/browser/profile_impl.h')
| -rw-r--r-- | chrome/browser/profile_impl.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/profile_impl.h b/chrome/browser/profile_impl.h index 9834fc1..fdae9e2 100644 --- a/chrome/browser/profile_impl.h +++ b/chrome/browser/profile_impl.h @@ -70,7 +70,7 @@ class ProfileImpl : public Profile, virtual TemplateURLFetcher* GetTemplateURLFetcher(); virtual DownloadManager* GetDownloadManager(); virtual PersonalDataManager* GetPersonalDataManager(); - virtual FileSystemHostContext* GetFileSystemHostContext(); + virtual BrowserFileSystemContext* GetFileSystemContext(); virtual void InitThemes(); virtual void SetTheme(const Extension* extension); virtual void SetNativeTheme(); @@ -105,7 +105,7 @@ class ProfileImpl : public Profile, virtual void ReinitializeSpellCheckHost(bool force); virtual WebKitContext* GetWebKitContext(); virtual DesktopNotificationService* GetDesktopNotificationService(); - virtual BackgroundContentsService* GetBackgroundContentsService(); + virtual BackgroundContentsService* GetBackgroundContentsService() const; virtual StatusTray* GetStatusTray(); virtual void MarkAsCleanShutdown(); virtual void InitExtensions(); @@ -122,6 +122,7 @@ class ProfileImpl : public Profile, void InitCloudPrintProxyService(); virtual ChromeBlobStorageContext* GetBlobStorageContext(); virtual ExtensionInfoMap* GetExtensionInfoMap(); + virtual PromoCounter* GetInstantPromoCounter(); virtual BrowserSignin* GetBrowserSignin(); #if defined(OS_CHROMEOS) @@ -221,7 +222,7 @@ class ProfileImpl : public Profile, scoped_ptr<StatusTray> status_tray_; scoped_refptr<PersonalDataManager> personal_data_manager_; scoped_ptr<PinnedTabService> pinned_tab_service_; - scoped_refptr<FileSystemHostContext> file_system_host_context_; + scoped_refptr<BrowserFileSystemContext> browser_file_system_context_; scoped_ptr<BrowserSignin> browser_signin_; bool history_service_created_; bool favicon_service_created_; @@ -247,6 +248,11 @@ class ProfileImpl : public Profile, // finished. bool spellcheck_host_ready_; +#if defined(OS_WIN) + bool checked_instant_promo_; + scoped_ptr<PromoCounter> instant_promo_counter_; +#endif + // Set to true when ShutdownSessionService is invoked. If true // GetSessionService won't recreate the SessionService. bool shutdown_session_service_; |