| OLD | NEW |
| 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) |
| 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)); | 21 GetInstance()->GetServiceForProfile(profile, true)); |
| 22 } | 22 } |
| 23 | 23 |
| 24 // static | 24 // static |
| 25 const Extension* ThemeServiceFactory::GetThemeForProfile(Profile* profile) { | 25 const Extension* ThemeServiceFactory::GetThemeForProfile(Profile* profile) { |
| 26 std::string id = GetForProfile(profile)->GetThemeID(); | 26 std::string id = GetForProfile(profile)->GetThemeID(); |
| 27 if (id == ThemeService::kDefaultThemeID) | 27 if (id == ThemeService::kDefaultThemeID) |
| 28 return NULL; | 28 return NULL; |
| 29 | 29 |
| 30 return profile->GetExtensionService()->GetExtensionById(id, false); | 30 return profile->GetExtensionService()->GetExtensionById(id, false); |
| 31 } | 31 } |
| (...skipping 19 matching lines...) Expand all Loading... |
| 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 } |
| OLD | NEW |