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

Side by Side Diff: chrome/browser/managed_mode/managed_user_shared_settings_service.cc

Issue 271793003: components: Extract pref_registry component out of user_prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/managed_mode/managed_user_shared_settings_service.h" 5 #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/prefs/scoped_user_pref_update.h" 10 #include "base/prefs/scoped_user_pref_update.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 #include "components/user_prefs/pref_registry_syncable.h" 13 #include "components/pref_registry/pref_registry_syncable.h"
14 #include "sync/api/sync_change.h" 14 #include "sync/api/sync_change.h"
15 #include "sync/api/sync_data.h" 15 #include "sync/api/sync_data.h"
16 #include "sync/api/sync_error.h" 16 #include "sync/api/sync_error.h"
17 #include "sync/api/sync_error_factory.h" 17 #include "sync/api/sync_error_factory.h"
18 #include "sync/api/sync_merge_result.h" 18 #include "sync/api/sync_merge_result.h"
19 #include "sync/protocol/sync.pb.h" 19 #include "sync/protocol/sync.pb.h"
20 20
21 using base::DictionaryValue; 21 using base::DictionaryValue;
22 using base::Value; 22 using base::Value;
23 using syncer::MANAGED_USER_SHARED_SETTINGS; 23 using syncer::MANAGED_USER_SHARED_SETTINGS;
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 NOTREACHED(); 337 NOTREACHED();
338 break; 338 break;
339 } 339 }
340 } 340 }
341 callbacks_.Notify(mu_id, key); 341 callbacks_.Notify(mu_id, key);
342 } 342 }
343 343
344 SyncError error; 344 SyncError error;
345 return error; 345 return error;
346 } 346 }
OLDNEW
« no previous file with comments | « chrome/browser/managed_mode/managed_user_service.cc ('k') | chrome/browser/managed_mode/managed_user_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698