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 "build/build_config.h" |
9 #include "chrome/browser/profiles/incognito_helpers.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/themes/theme_service.h" | 12 #include "chrome/browser/themes/theme_service.h" |
12 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
13 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 14 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
14 #include "components/pref_registry/pref_registry_syncable.h" | 15 #include "components/pref_registry/pref_registry_syncable.h" |
15 #include "extensions/browser/extension_registry.h" | 16 #include "extensions/browser/extension_registry.h" |
16 #include "extensions/browser/extension_registry_factory.h" | 17 #include "extensions/browser/extension_registry_factory.h" |
17 | 18 |
18 #if defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS) | 19 #if defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS) |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 } | 90 } |
90 | 91 |
91 content::BrowserContext* ThemeServiceFactory::GetBrowserContextToUse( | 92 content::BrowserContext* ThemeServiceFactory::GetBrowserContextToUse( |
92 content::BrowserContext* context) const { | 93 content::BrowserContext* context) const { |
93 return chrome::GetBrowserContextRedirectedInIncognito(context); | 94 return chrome::GetBrowserContextRedirectedInIncognito(context); |
94 } | 95 } |
95 | 96 |
96 bool ThemeServiceFactory::ServiceIsCreatedWithBrowserContext() const { | 97 bool ThemeServiceFactory::ServiceIsCreatedWithBrowserContext() const { |
97 return true; | 98 return true; |
98 } | 99 } |
OLD | NEW |