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

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

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Still a few linking errors to resolve. Created 9 years, 3 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 #include "chrome/browser/themes/theme_service_factory.h" 5 #include "chrome/browser/themes/theme_service_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/profiles/profile_dependency_manager.h" 10 #include "chrome/browser/profiles/profile_dependency_manager.h"
11 #include "chrome/browser/themes/theme_service.h" 11 #include "chrome/browser/themes/theme_service.h"
12 #include "content/common/notification_service.h" 12 #include "content/common/notification_service.h"
13 13
14 #if defined(TOOLKIT_USES_GTK) 14 #if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
15 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 15 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
16 #endif 16 #endif
17 17
18 // static 18 // static
19 ThemeService* ThemeServiceFactory::GetForProfile(Profile* profile) { 19 ThemeService* ThemeServiceFactory::GetForProfile(Profile* profile) {
20 return static_cast<ThemeService*>( 20 return static_cast<ThemeService*>(
21 GetInstance()->GetServiceForProfile(profile, true)); 21 GetInstance()->GetServiceForProfile(profile, true));
22 } 22 }
23 23
24 // static 24 // static
(...skipping 13 matching lines...) Expand all
38 ThemeServiceFactory::ThemeServiceFactory() 38 ThemeServiceFactory::ThemeServiceFactory()
39 : ProfileKeyedServiceFactory( 39 : ProfileKeyedServiceFactory(
40 ProfileDependencyManager::GetInstance()) 40 ProfileDependencyManager::GetInstance())
41 {} 41 {}
42 42
43 ThemeServiceFactory::~ThemeServiceFactory() {} 43 ThemeServiceFactory::~ThemeServiceFactory() {}
44 44
45 ProfileKeyedService* ThemeServiceFactory::BuildServiceInstanceFor( 45 ProfileKeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
46 Profile* profile) const { 46 Profile* profile) const {
47 ThemeService* provider = NULL; 47 ThemeService* provider = NULL;
48 #if defined(TOOLKIT_USES_GTK) 48 #if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
49 provider = new GtkThemeService; 49 provider = new GtkThemeService;
50 #else 50 #else
51 provider = new ThemeService; 51 provider = new ThemeService;
52 #endif 52 #endif
53 provider->Init(profile); 53 provider->Init(profile);
54 54
55 return provider; 55 return provider;
56 } 56 }
57 57
58 bool ThemeServiceFactory::ServiceRedirectedInIncognito() { 58 bool ThemeServiceFactory::ServiceRedirectedInIncognito() {
59 return true; 59 return true;
60 } 60 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698