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

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

Issue 11734009: sync: Add ControlPreference protobuf and supporting code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix integration tests Created 7 years, 11 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 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 browser_sync::user_selectable_type::AUTOFILL, 1299 browser_sync::user_selectable_type::AUTOFILL,
1300 browser_sync::user_selectable_type::BOOKMARKS, 1300 browser_sync::user_selectable_type::BOOKMARKS,
1301 browser_sync::user_selectable_type::EXTENSIONS, 1301 browser_sync::user_selectable_type::EXTENSIONS,
1302 browser_sync::user_selectable_type::PASSWORDS, 1302 browser_sync::user_selectable_type::PASSWORDS,
1303 browser_sync::user_selectable_type::PREFERENCES, 1303 browser_sync::user_selectable_type::PREFERENCES,
1304 browser_sync::user_selectable_type::SESSIONS, 1304 browser_sync::user_selectable_type::SESSIONS,
1305 browser_sync::user_selectable_type::THEMES, 1305 browser_sync::user_selectable_type::THEMES,
1306 browser_sync::user_selectable_type::TYPED_URLS 1306 browser_sync::user_selectable_type::TYPED_URLS
1307 }; 1307 };
1308 1308
1309 COMPILE_ASSERT(20 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); 1309 COMPILE_ASSERT(21 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);
1310 COMPILE_ASSERT(arraysize(model_types) == 1310 COMPILE_ASSERT(arraysize(model_types) ==
1311 browser_sync::user_selectable_type::SELECTABLE_DATATYPE_COUNT, 1311 browser_sync::user_selectable_type::SELECTABLE_DATATYPE_COUNT,
1312 UpdateCustomConfigHistogram); 1312 UpdateCustomConfigHistogram);
1313 COMPILE_ASSERT(arraysize(model_types) == arraysize(user_selectable_types), 1313 COMPILE_ASSERT(arraysize(model_types) == arraysize(user_selectable_types),
1314 UpdateCustomConfigHistogram); 1314 UpdateCustomConfigHistogram);
1315 1315
1316 if (!sync_everything) { 1316 if (!sync_everything) {
1317 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); 1317 const syncer::ModelTypeSet current_types = GetPreferredDataTypes();
1318 for (size_t i = 0; i < arraysize(model_types); ++i) { 1318 for (size_t i = 0; i < arraysize(model_types); ++i) {
1319 const syncer::ModelType type = model_types[i]; 1319 const syncer::ModelType type = model_types[i];
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
1911 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru. 1911 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru.
1912 ProfileSyncService* old_this = this; 1912 ProfileSyncService* old_this = this;
1913 this->~ProfileSyncService(); 1913 this->~ProfileSyncService();
1914 new(old_this) ProfileSyncService( 1914 new(old_this) ProfileSyncService(
1915 new ProfileSyncComponentsFactoryImpl(profile, 1915 new ProfileSyncComponentsFactoryImpl(profile,
1916 CommandLine::ForCurrentProcess()), 1916 CommandLine::ForCurrentProcess()),
1917 profile, 1917 profile,
1918 signin, 1918 signin,
1919 behavior); 1919 behavior);
1920 } 1920 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698