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

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 7 years, 12 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 "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/prefs/pref_service.h" 9 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #if defined(TOOLKIT_GTK) 49 #if defined(TOOLKIT_GTK)
50 provider = new GtkThemeService; 50 provider = new GtkThemeService;
51 #else 51 #else
52 provider = new ThemeService; 52 provider = new ThemeService;
53 #endif 53 #endif
54 provider->Init(profile); 54 provider->Init(profile);
55 55
56 return provider; 56 return provider;
57 } 57 }
58 58
59 void ThemeServiceFactory::RegisterUserPrefs(PrefService* prefs) { 59 void ThemeServiceFactory::RegisterUserPrefs(PrefServiceSyncable* prefs) {
60 #if defined(TOOLKIT_GTK) 60 #if defined(TOOLKIT_GTK)
61 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme, 61 prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,
62 GtkThemeService::DefaultUsesSystemTheme(), 62 GtkThemeService::DefaultUsesSystemTheme(),
63 PrefService::UNSYNCABLE_PREF); 63 PrefServiceSyncable::UNSYNCABLE_PREF);
64 #endif 64 #endif
65 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename, 65 prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename,
66 FilePath(), 66 FilePath(),
67 PrefService::UNSYNCABLE_PREF); 67 PrefServiceSyncable::UNSYNCABLE_PREF);
68 prefs->RegisterStringPref(prefs::kCurrentThemeID, 68 prefs->RegisterStringPref(prefs::kCurrentThemeID,
69 ThemeService::kDefaultThemeID, 69 ThemeService::kDefaultThemeID,
70 PrefService::UNSYNCABLE_PREF); 70 PrefServiceSyncable::UNSYNCABLE_PREF);
71 prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages, 71 prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages,
72 PrefService::UNSYNCABLE_PREF); 72 PrefServiceSyncable::UNSYNCABLE_PREF);
73 prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors, 73 prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors,
74 PrefService::UNSYNCABLE_PREF); 74 PrefServiceSyncable::UNSYNCABLE_PREF);
75 prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints, 75 prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints,
76 PrefService::UNSYNCABLE_PREF); 76 PrefServiceSyncable::UNSYNCABLE_PREF);
77 prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties, 77 prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties,
78 PrefService::UNSYNCABLE_PREF); 78 PrefServiceSyncable::UNSYNCABLE_PREF);
79 } 79 }
80 80
81 bool ThemeServiceFactory::ServiceRedirectedInIncognito() const { 81 bool ThemeServiceFactory::ServiceRedirectedInIncognito() const {
82 return true; 82 return true;
83 } 83 }
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service_factory.h ('k') | chrome/browser/translate/translate_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698