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

Side by Side Diff: components/sync/driver/sync_prefs.cc

Issue 2387553002: [Sync] Removing duplicated includes between cc and h files. (Closed)
Patch Set: Fixing DataTypeStatusTable Created 4 years, 2 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 (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 "components/sync/driver/sync_prefs.h" 5 #include "components/sync/driver/sync_prefs.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "build/build_config.h"
12 #include "components/pref_registry/pref_registry_syncable.h" 11 #include "components/pref_registry/pref_registry_syncable.h"
13 #include "components/prefs/pref_member.h"
14 #include "components/prefs/pref_service.h" 12 #include "components/prefs/pref_service.h"
15 #include "components/sync/driver/pref_names.h" 13 #include "components/sync/driver/pref_names.h"
16 14
17 namespace sync_driver { 15 namespace sync_driver {
18 16
19 SyncPrefObserver::~SyncPrefObserver() {} 17 SyncPrefObserver::~SyncPrefObserver() {}
20 18
21 SyncPrefs::SyncPrefs(PrefService* pref_service) : pref_service_(pref_service) { 19 SyncPrefs::SyncPrefs(PrefService* pref_service) : pref_service_(pref_service) {
22 DCHECK(pref_service); 20 DCHECK(pref_service);
23 RegisterPrefGroups(); 21 RegisterPrefGroups();
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>(); 550 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>();
553 551
554 std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> result( 552 std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> result(
555 new syncer::SyncEncryptionHandler::NigoriState()); 553 new syncer::SyncEncryptionHandler::NigoriState());
556 if (!result->nigori_specifics.ParseFromString(decoded)) 554 if (!result->nigori_specifics.ParseFromString(decoded))
557 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>(); 555 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>();
558 return result; 556 return result;
559 } 557 }
560 558
561 } // namespace sync_driver 559 } // namespace sync_driver
OLDNEW
« no previous file with comments | « components/sync/driver/shared_change_processor.cc ('k') | components/sync/driver/sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698