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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
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"
9 #include "build/build_config.h" 8 #include "build/build_config.h"
10 #include "chrome/browser/profiles/incognito_helpers.h" 9 #include "chrome/browser/profiles/incognito_helpers.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/themes/theme_service.h" 11 #include "chrome/browser/themes/theme_service.h"
13 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
14 #include "components/keyed_service/content/browser_context_dependency_manager.h" 13 #include "components/keyed_service/content/browser_context_dependency_manager.h"
15 #include "components/pref_registry/pref_registry_syncable.h" 14 #include "components/pref_registry/pref_registry_syncable.h"
15 #include "components/prefs/pref_service.h"
16 #include "extensions/browser/extension_registry.h" 16 #include "extensions/browser/extension_registry.h"
17 #include "extensions/browser/extension_registry_factory.h" 17 #include "extensions/browser/extension_registry_factory.h"
18 18
19 #if defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS) 19 #if defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)
20 #include "chrome/browser/themes/theme_service_aurax11.h" 20 #include "chrome/browser/themes/theme_service_aurax11.h"
21 #include "ui/views/linux_ui/linux_ui.h" 21 #include "ui/views/linux_ui/linux_ui.h"
22 #endif 22 #endif
23 23
24 // static 24 // static
25 ThemeService* ThemeServiceFactory::GetForProfile(Profile* profile) { 25 ThemeService* ThemeServiceFactory::GetForProfile(Profile* profile) {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 } 90 }
91 91
92 content::BrowserContext* ThemeServiceFactory::GetBrowserContextToUse( 92 content::BrowserContext* ThemeServiceFactory::GetBrowserContextToUse(
93 content::BrowserContext* context) const { 93 content::BrowserContext* context) const {
94 return chrome::GetBrowserContextRedirectedInIncognito(context); 94 return chrome::GetBrowserContextRedirectedInIncognito(context);
95 } 95 }
96 96
97 bool ThemeServiceFactory::ServiceIsCreatedWithBrowserContext() const { 97 bool ThemeServiceFactory::ServiceIsCreatedWithBrowserContext() const {
98 return true; 98 return true;
99 } 99 }
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service_browsertest.cc ('k') | chrome/browser/tracing/chrome_tracing_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698