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

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

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 years, 9 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) 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/prefs/pref_registry_syncable.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/profiles/profile_dependency_manager.h" 11 #include "chrome/browser/profiles/profile_dependency_manager.h"
13 #include "chrome/browser/themes/theme_service.h" 12 #include "chrome/browser/themes/theme_service.h"
14 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "components/user_prefs/pref_registry_syncable.h"
15 15
16 #if defined(TOOLKIT_GTK) 16 #if defined(TOOLKIT_GTK)
17 #include "chrome/browser/ui/gtk/gtk_theme_service.h" 17 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
18 #endif 18 #endif
19 19
20 // static 20 // static
21 ThemeService* ThemeServiceFactory::GetForProfile(Profile* profile) { 21 ThemeService* ThemeServiceFactory::GetForProfile(Profile* profile) {
22 return static_cast<ThemeService*>( 22 return static_cast<ThemeService*>(
23 GetInstance()->GetServiceForProfile(profile, true)); 23 GetInstance()->GetServiceForProfile(profile, true));
24 } 24 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 registry->RegisterDictionaryPref(prefs::kCurrentThemeColors, 74 registry->RegisterDictionaryPref(prefs::kCurrentThemeColors,
75 PrefRegistrySyncable::UNSYNCABLE_PREF); 75 PrefRegistrySyncable::UNSYNCABLE_PREF);
76 registry->RegisterDictionaryPref(prefs::kCurrentThemeTints, 76 registry->RegisterDictionaryPref(prefs::kCurrentThemeTints,
77 PrefRegistrySyncable::UNSYNCABLE_PREF); 77 PrefRegistrySyncable::UNSYNCABLE_PREF);
78 registry->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties, 78 registry->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties,
79 PrefRegistrySyncable::UNSYNCABLE_PREF); 79 PrefRegistrySyncable::UNSYNCABLE_PREF);
80 } 80 }
81 81
82 bool ThemeServiceFactory::ServiceRedirectedInIncognito() const { 82 bool ThemeServiceFactory::ServiceRedirectedInIncognito() const {
83 return true; 83 return true;
84 } 84 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698