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

Side by Side Diff: chrome/browser/sync/glue/model_association_manager.cc

Issue 10855037: [Sync] Add history delete directive type (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service.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 #include <algorithm> 5 #include <algorithm>
6 #include <functional> 6 #include <functional>
7 7
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 syncer::THEMES, 45 syncer::THEMES,
46 syncer::SEARCH_ENGINES, 46 syncer::SEARCH_ENGINES,
47 syncer::SESSIONS, 47 syncer::SESSIONS,
48 syncer::APP_NOTIFICATIONS, 48 syncer::APP_NOTIFICATIONS,
49 syncer::AUTOFILL, // Non-UI thread datatypes. 49 syncer::AUTOFILL, // Non-UI thread datatypes.
50 syncer::AUTOFILL_PROFILE, 50 syncer::AUTOFILL_PROFILE,
51 syncer::EXTENSION_SETTINGS, 51 syncer::EXTENSION_SETTINGS,
52 syncer::APP_SETTINGS, 52 syncer::APP_SETTINGS,
53 syncer::TYPED_URLS, 53 syncer::TYPED_URLS,
54 syncer::PASSWORDS, 54 syncer::PASSWORDS,
55 syncer::HISTORY_DELETE_DIRECTIVES,
55 }; 56 };
56 57
57 COMPILE_ASSERT(arraysize(kStartOrder) == 58 COMPILE_ASSERT(arraysize(kStartOrder) ==
58 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE, 59 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE,
59 kStartOrder_IncorrectSize); 60 kStartOrder_IncorrectSize);
60 61
61 // Comparator used when sorting data type controllers. 62 // Comparator used when sorting data type controllers.
62 class SortComparator : public std::binary_function<DataTypeController*, 63 class SortComparator : public std::binary_function<DataTypeController*,
63 DataTypeController*, 64 DataTypeController*,
64 bool> { 65 bool> {
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 } 503 }
503 return result; 504 return result;
504 } 505 }
505 506
506 base::OneShotTimer<ModelAssociationManager>* 507 base::OneShotTimer<ModelAssociationManager>*
507 ModelAssociationManager::GetTimerForTesting() { 508 ModelAssociationManager::GetTimerForTesting() {
508 return &timer_; 509 return &timer_;
509 } 510 }
510 511
511 } // namespace browser_sync 512 } // namespace browser_sync
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698