diff options
| author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 19:05:42 +0000 |
|---|---|---|
| committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 19:05:42 +0000 |
| commit | fc1e52d59a43854f9be84dbe1dd03191c67ebaa3 (patch) | |
| tree | b7240d58bca7faa802a5c536c129d89bbe9f7ade /chrome/test/testing_profile.h | |
| parent | 9c5330953b0d6fb7120395b3b1465a789caf6bf9 (diff) | |
| download | chromium_src-fc1e52d59a43854f9be84dbe1dd03191c67ebaa3.zip chromium_src-fc1e52d59a43854f9be84dbe1dd03191c67ebaa3.tar.gz chromium_src-fc1e52d59a43854f9be84dbe1dd03191c67ebaa3.tar.bz2 | |
Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now owned byDesktopNotificationServiceFactory, using Profile as a key. This uses theProfileKeyedService infrastructure originally created forThemeServiceFactory.BUG=77155TEST=existing testsReview URL: http://codereview.chromium.org/6803012
TBR=torne@chromium.org
Review URL: http://codereview.chromium.org/6813116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.h')
| -rw-r--r-- | chrome/test/testing_profile.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 8b519d2..154294f 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -27,6 +27,7 @@ class SpecialStoragePolicy; class AutocompleteClassifier; class BookmarkModel; class CommandLine; +class DesktopNotificationService; class ExtensionPrefs; class ExtensionPrefStore; class ExtensionPrefValueMap; @@ -129,6 +130,8 @@ class TestingProfile : public Profile { TestingPrefService* GetTestingPrefService(); + void SetProfileDependencyManager(ProfileDependencyManager* manager); + virtual ProfileId GetRuntimeId(); virtual FilePath GetPath(); @@ -247,6 +250,7 @@ class TestingProfile : public Profile { virtual void InitRegisteredProtocolHandlers() {} virtual NTPResourceCache* GetNTPResourceCache(); + virtual DesktopNotificationService* GetDesktopNotificationService(); virtual BackgroundContentsService* GetBackgroundContentsService() const; virtual StatusTray* GetStatusTray(); virtual FilePath last_selected_directory(); @@ -367,6 +371,7 @@ class TestingProfile : public Profile { scoped_refptr<GeolocationContentSettingsMap> geolocation_content_settings_map_; scoped_refptr<GeolocationPermissionContext> geolocation_permission_context_; + scoped_ptr<DesktopNotificationService> desktop_notification_service_; // Find bar state. Created lazily by GetFindBarState(). scoped_ptr<FindBarState> find_bar_state_; |