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

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 10911073: NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix several issues Created 8 years, 3 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 (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 "chrome/browser/sync/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 browser_sync::user_selectable_type::AUTOFILL, 1220 browser_sync::user_selectable_type::AUTOFILL,
1221 browser_sync::user_selectable_type::BOOKMARKS, 1221 browser_sync::user_selectable_type::BOOKMARKS,
1222 browser_sync::user_selectable_type::EXTENSIONS, 1222 browser_sync::user_selectable_type::EXTENSIONS,
1223 browser_sync::user_selectable_type::PASSWORDS, 1223 browser_sync::user_selectable_type::PASSWORDS,
1224 browser_sync::user_selectable_type::PREFERENCES, 1224 browser_sync::user_selectable_type::PREFERENCES,
1225 browser_sync::user_selectable_type::SESSIONS, 1225 browser_sync::user_selectable_type::SESSIONS,
1226 browser_sync::user_selectable_type::THEMES, 1226 browser_sync::user_selectable_type::THEMES,
1227 browser_sync::user_selectable_type::TYPED_URLS 1227 browser_sync::user_selectable_type::TYPED_URLS
1228 }; 1228 };
1229 1229
1230 COMPILE_ASSERT(17 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); 1230 COMPILE_ASSERT(18 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);
1231 COMPILE_ASSERT(arraysize(model_types) == 1231 COMPILE_ASSERT(arraysize(model_types) ==
1232 browser_sync::user_selectable_type::SELECTABLE_DATATYPE_COUNT, 1232 browser_sync::user_selectable_type::SELECTABLE_DATATYPE_COUNT,
1233 UpdateCustomConfigHistogram); 1233 UpdateCustomConfigHistogram);
1234 COMPILE_ASSERT(arraysize(model_types) == arraysize(user_selectable_types), 1234 COMPILE_ASSERT(arraysize(model_types) == arraysize(user_selectable_types),
1235 UpdateCustomConfigHistogram); 1235 UpdateCustomConfigHistogram);
1236 1236
1237 if (!sync_everything) { 1237 if (!sync_everything) {
1238 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); 1238 const syncer::ModelTypeSet current_types = GetPreferredDataTypes();
1239 for (size_t i = 0; i < arraysize(model_types); ++i) { 1239 for (size_t i = 0; i < arraysize(model_types); ++i) {
1240 const syncer::ModelType type = model_types[i]; 1240 const syncer::ModelType type = model_types[i];
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
1810 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru. 1810 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru.
1811 ProfileSyncService* old_this = this; 1811 ProfileSyncService* old_this = this;
1812 this->~ProfileSyncService(); 1812 this->~ProfileSyncService();
1813 new(old_this) ProfileSyncService( 1813 new(old_this) ProfileSyncService(
1814 new ProfileSyncComponentsFactoryImpl(profile, 1814 new ProfileSyncComponentsFactoryImpl(profile,
1815 CommandLine::ForCurrentProcess()), 1815 CommandLine::ForCurrentProcess()),
1816 profile, 1816 profile,
1817 signin, 1817 signin,
1818 behavior); 1818 behavior);
1819 } 1819 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698