Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2862)

Unified Diff: chrome/browser/themes/theme_service_factory.cc

Issue 6813116: Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/themes/theme_service_factory.cc
===================================================================
--- chrome/browser/themes/theme_service_factory.cc (revision 81278)
+++ chrome/browser/themes/theme_service_factory.cc (working copy)
@@ -21,7 +21,6 @@
GetInstance()->GetServiceForProfile(profile));
}
-// static
const Extension* ThemeServiceFactory::GetThemeForProfile(Profile* profile) {
std::string id = GetForProfile(profile)->GetThemeID();
if (id == ThemeService::kDefaultThemeID)
@@ -30,7 +29,11 @@
return profile->GetExtensionService()->GetExtensionById(id, false);
}
-// static
+void ThemeServiceFactory::ForceAssociationBetween(Profile* profile,
+ ThemeService* provider) {
+ GetInstance()->Associate(profile, provider);
+}
+
ThemeServiceFactory* ThemeServiceFactory::GetInstance() {
return Singleton<ThemeServiceFactory>::get();
}
« no previous file with comments | « chrome/browser/themes/theme_service_factory.h ('k') | chrome/browser/ui/cocoa/notifications/balloon_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698