| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/profiles/incognito_helpers.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/profiles/profile_dependency_manager.h" | 12 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| 12 #include "chrome/browser/themes/theme_service.h" | 13 #include "chrome/browser/themes/theme_service.h" |
| 13 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 14 #include "components/user_prefs/pref_registry_syncable.h" | 15 #include "components/user_prefs/pref_registry_syncable.h" |
| 15 | 16 |
| 16 #if defined(TOOLKIT_GTK) | 17 #if defined(TOOLKIT_GTK) |
| 17 #include "chrome/browser/ui/gtk/gtk_theme_service.h" | 18 #include "chrome/browser/ui/gtk/gtk_theme_service.h" |
| 18 #endif | 19 #endif |
| 19 | 20 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 registry->RegisterDictionaryPref(prefs::kCurrentThemeImages, | 73 registry->RegisterDictionaryPref(prefs::kCurrentThemeImages, |
| 73 PrefRegistrySyncable::UNSYNCABLE_PREF); | 74 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 74 registry->RegisterDictionaryPref(prefs::kCurrentThemeColors, | 75 registry->RegisterDictionaryPref(prefs::kCurrentThemeColors, |
| 75 PrefRegistrySyncable::UNSYNCABLE_PREF); | 76 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 76 registry->RegisterDictionaryPref(prefs::kCurrentThemeTints, | 77 registry->RegisterDictionaryPref(prefs::kCurrentThemeTints, |
| 77 PrefRegistrySyncable::UNSYNCABLE_PREF); | 78 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 78 registry->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties, | 79 registry->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties, |
| 79 PrefRegistrySyncable::UNSYNCABLE_PREF); | 80 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 80 } | 81 } |
| 81 | 82 |
| 82 bool ThemeServiceFactory::ServiceRedirectedInIncognito() const { | 83 content::BrowserContext* ThemeServiceFactory::GetBrowserContextToUse( |
| 83 return true; | 84 content::BrowserContext* context) const { |
| 85 return chrome::GetBrowserContextRedirectedInIncognito(context); |
| 84 } | 86 } |
| 85 | 87 |
| 86 bool ThemeServiceFactory::ServiceIsCreatedWithProfile() const { | 88 bool ThemeServiceFactory::ServiceIsCreatedWithProfile() const { |
| 87 return true; | 89 return true; |
| 88 } | 90 } |
| OLD | NEW |