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

Side by Side Diff: chrome/browser/themes/theme_service_factory.h

Issue 6803012: Profile shouldn't own DesktopNotificationService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_FACTORY_H_ 5 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_FACTORY_H_
6 #define CHROME_BROWSER_THEMES_THEME_SERVICE_FACTORY_H_ 6 #define CHROME_BROWSER_THEMES_THEME_SERVICE_FACTORY_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 13 matching lines...) Expand all
24 // Returns the ThemeService that provides theming resources for 24 // Returns the ThemeService that provides theming resources for
25 // |profile|. Note that even if a Profile doesn't have a theme installed, it 25 // |profile|. Note that even if a Profile doesn't have a theme installed, it
26 // still needs a ThemeService to hand back the default theme images. 26 // still needs a ThemeService to hand back the default theme images.
27 static ThemeService* GetForProfile(Profile* profile); 27 static ThemeService* GetForProfile(Profile* profile);
28 28
29 // Returns the Extension that implements the theme associated with 29 // Returns the Extension that implements the theme associated with
30 // |profile|. Returns NULL if the theme is no longer installed, if there is 30 // |profile|. Returns NULL if the theme is no longer installed, if there is
31 // no installed theme, or the theme was cleared. 31 // no installed theme, or the theme was cleared.
32 static const Extension* GetThemeForProfile(Profile* profile); 32 static const Extension* GetThemeForProfile(Profile* profile);
33 33
34 // Forces an association between |profile| and |provider|. Used in unit tests
35 // where we need to mock ThemeService.
36 static void ForceAssociationBetween(Profile* profile,
37 ThemeService* provider);
38
39 static ThemeServiceFactory* GetInstance(); 34 static ThemeServiceFactory* GetInstance();
40 35
41 private: 36 private:
42 friend struct DefaultSingletonTraits<ThemeServiceFactory>; 37 friend struct DefaultSingletonTraits<ThemeServiceFactory>;
43 38
44 ThemeServiceFactory(); 39 ThemeServiceFactory();
45 virtual ~ThemeServiceFactory(); 40 virtual ~ThemeServiceFactory();
46 41
47 // ProfileKeyedServiceFactory: 42 // ProfileKeyedServiceFactory:
48 virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile) const; 43 virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile) const;
49 virtual bool ServiceRedirectedInIncognito(); 44 virtual bool ServiceRedirectedInIncognito();
50 }; 45 };
51 46
52 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_FACTORY_H_ 47 #endif // CHROME_BROWSER_THEMES_THEME_SERVICE_FACTORY_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/theme_util_unittest.cc ('k') | chrome/browser/themes/theme_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698