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

Side by Side Diff: chrome/browser/prefs/pref_service_syncable_builder.cc

Issue 23610004: Rename managed user pref store to supervised user pref store. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 3 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/prefs/pref_service_syncable_builder.h" 5 #include "chrome/browser/prefs/pref_service_syncable_builder.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/prefs/default_pref_store.h" 8 #include "base/prefs/default_pref_store.h"
9 #include "base/prefs/pref_notifier_impl.h" 9 #include "base/prefs/pref_notifier_impl.h"
10 #include "base/prefs/pref_value_store.h" 10 #include "base/prefs/pref_value_store.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 return *this; 52 return *this;
53 } 53 }
54 54
55 PrefServiceSyncable* PrefServiceSyncableBuilder::CreateSyncable( 55 PrefServiceSyncable* PrefServiceSyncableBuilder::CreateSyncable(
56 user_prefs::PrefRegistrySyncable* pref_registry) { 56 user_prefs::PrefRegistrySyncable* pref_registry) {
57 TRACE_EVENT0("browser", "PrefServiceSyncableBuilder::CreateSyncable"); 57 TRACE_EVENT0("browser", "PrefServiceSyncableBuilder::CreateSyncable");
58 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); 58 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
59 PrefServiceSyncable* pref_service = new PrefServiceSyncable( 59 PrefServiceSyncable* pref_service = new PrefServiceSyncable(
60 pref_notifier, 60 pref_notifier,
61 new PrefValueStore(managed_prefs_.get(), 61 new PrefValueStore(managed_prefs_.get(),
62 managed_user_prefs_.get(), 62 supervised_user_prefs_.get(),
63 extension_prefs_.get(), 63 extension_prefs_.get(),
64 command_line_prefs_.get(), 64 command_line_prefs_.get(),
65 user_prefs_.get(), 65 user_prefs_.get(),
66 recommended_prefs_.get(), 66 recommended_prefs_.get(),
67 pref_registry->defaults().get(), 67 pref_registry->defaults().get(),
68 pref_notifier), 68 pref_notifier),
69 user_prefs_.get(), 69 user_prefs_.get(),
70 pref_registry, 70 pref_registry,
71 read_error_callback_, 71 read_error_callback_,
72 async_); 72 async_);
73 ResetDefaultState(); 73 ResetDefaultState();
74 return pref_service; 74 return pref_service;
75 } 75 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/pref_service_syncable.cc ('k') | chrome/test/base/testing_pref_service_syncable.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698