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

Side by Side Diff: components/sync_driver/sync_prefs.h

Issue 1380693004: [Sync] Fixing sync_driver lint violations and adding PRESUBMIT lint check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cross
Patch Set: Removing lint fixes for revisit files, removing revisit patch dep. Created 5 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
« no previous file with comments | « components/sync_driver/sync_frontend.h ('k') | components/sync_driver/sync_prefs_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef COMPONENTS_SYNC_DRIVER_SYNC_PREFS_H_ 5 #ifndef COMPONENTS_SYNC_DRIVER_SYNC_PREFS_H_
6 #define COMPONENTS_SYNC_DRIVER_SYNC_PREFS_H_ 6 #define COMPONENTS_SYNC_DRIVER_SYNC_PREFS_H_
7 7
8 #include <map>
9 #include <string>
10
8 #include "base/basictypes.h" 11 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
10 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
11 #include "base/observer_list.h" 14 #include "base/observer_list.h"
12 #include "base/prefs/pref_member.h" 15 #include "base/prefs/pref_member.h"
13 #include "base/threading/non_thread_safe.h" 16 #include "base/threading/non_thread_safe.h"
14 #include "base/time/time.h" 17 #include "base/time/time.h"
15 #include "sync/internal_api/public/base/model_type.h" 18 #include "sync/internal_api/public/base/model_type.h"
16 #include "sync/internal_api/public/sync_encryption_handler.h" 19 #include "sync/internal_api/public/sync_encryption_handler.h"
17 20
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 // etc. 217 // etc.
215 typedef std::map<syncer::ModelType, syncer::ModelTypeSet> PrefGroupsMap; 218 typedef std::map<syncer::ModelType, syncer::ModelTypeSet> PrefGroupsMap;
216 PrefGroupsMap pref_groups_; 219 PrefGroupsMap pref_groups_;
217 220
218 DISALLOW_COPY_AND_ASSIGN(SyncPrefs); 221 DISALLOW_COPY_AND_ASSIGN(SyncPrefs);
219 }; 222 };
220 223
221 } // namespace sync_driver 224 } // namespace sync_driver
222 225
223 #endif // COMPONENTS_SYNC_DRIVER_SYNC_PREFS_H_ 226 #endif // COMPONENTS_SYNC_DRIVER_SYNC_PREFS_H_
OLDNEW
« no previous file with comments | « components/sync_driver/sync_frontend.h ('k') | components/sync_driver/sync_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698