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

Side by Side Diff: chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service.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 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/supervised_user/legacy/supervised_user_shared_settings_ service.h" 5 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/json/json_writer.h" 12 #include "base/json/json_writer.h"
13 #include "base/prefs/pref_service.h"
14 #include "base/prefs/scoped_user_pref_update.h"
15 #include "base/values.h" 13 #include "base/values.h"
16 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
17 #include "components/pref_registry/pref_registry_syncable.h" 15 #include "components/pref_registry/pref_registry_syncable.h"
16 #include "components/prefs/pref_service.h"
17 #include "components/prefs/scoped_user_pref_update.h"
18 #include "sync/api/sync_change.h" 18 #include "sync/api/sync_change.h"
19 #include "sync/api/sync_data.h" 19 #include "sync/api/sync_data.h"
20 #include "sync/api/sync_error.h" 20 #include "sync/api/sync_error.h"
21 #include "sync/api/sync_error_factory.h" 21 #include "sync/api/sync_error_factory.h"
22 #include "sync/api/sync_merge_result.h" 22 #include "sync/api/sync_merge_result.h"
23 #include "sync/protocol/sync.pb.h" 23 #include "sync/protocol/sync.pb.h"
24 24
25 using base::DictionaryValue; 25 using base::DictionaryValue;
26 using base::Value; 26 using base::Value;
27 using syncer::ModelType; 27 using syncer::ModelType;
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 NOTREACHED(); 362 NOTREACHED();
363 break; 363 break;
364 } 364 }
365 } 365 }
366 callbacks_.Notify(su_id, key); 366 callbacks_.Notify(su_id, key);
367 } 367 }
368 368
369 SyncError error; 369 SyncError error;
370 return error; 370 return error;
371 } 371 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698