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

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

Issue 11445002: Sync user's custom spellcheck dictionary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add server-side size limit 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
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 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 browser_sync::user_selectable_type::BOOKMARKS, 1301 browser_sync::user_selectable_type::BOOKMARKS,
1302 browser_sync::user_selectable_type::EXTENSIONS, 1302 browser_sync::user_selectable_type::EXTENSIONS,
1303 browser_sync::user_selectable_type::PASSWORDS, 1303 browser_sync::user_selectable_type::PASSWORDS,
1304 browser_sync::user_selectable_type::PREFERENCES, 1304 browser_sync::user_selectable_type::PREFERENCES,
1305 browser_sync::user_selectable_type::SESSIONS, 1305 browser_sync::user_selectable_type::SESSIONS,
1306 browser_sync::user_selectable_type::SYNCED_NOTIFICATIONS, 1306 browser_sync::user_selectable_type::SYNCED_NOTIFICATIONS,
1307 browser_sync::user_selectable_type::THEMES, 1307 browser_sync::user_selectable_type::THEMES,
1308 browser_sync::user_selectable_type::TYPED_URLS 1308 browser_sync::user_selectable_type::TYPED_URLS
1309 }; 1309 };
1310 1310
1311 COMPILE_ASSERT(21 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); 1311 COMPILE_ASSERT(22 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);
1312 COMPILE_ASSERT(arraysize(model_types) == 1312 COMPILE_ASSERT(arraysize(model_types) ==
1313 browser_sync::user_selectable_type::SELECTABLE_DATATYPE_COUNT, 1313 browser_sync::user_selectable_type::SELECTABLE_DATATYPE_COUNT,
1314 UpdateCustomConfigHistogram); 1314 UpdateCustomConfigHistogram);
1315 COMPILE_ASSERT(arraysize(model_types) == arraysize(user_selectable_types), 1315 COMPILE_ASSERT(arraysize(model_types) == arraysize(user_selectable_types),
1316 UpdateCustomConfigHistogram); 1316 UpdateCustomConfigHistogram);
1317 1317
1318 if (!sync_everything) { 1318 if (!sync_everything) {
1319 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); 1319 const syncer::ModelTypeSet current_types = GetPreferredDataTypes();
1320 for (size_t i = 0; i < arraysize(model_types); ++i) { 1320 for (size_t i = 0; i < arraysize(model_types); ++i) {
1321 const syncer::ModelType type = model_types[i]; 1321 const syncer::ModelType type = model_types[i];
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
1913 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru. 1913 // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefine d-behaviour-after-directly-calling-the-destru.
1914 ProfileSyncService* old_this = this; 1914 ProfileSyncService* old_this = this;
1915 this->~ProfileSyncService(); 1915 this->~ProfileSyncService();
1916 new(old_this) ProfileSyncService( 1916 new(old_this) ProfileSyncService(
1917 new ProfileSyncComponentsFactoryImpl(profile, 1917 new ProfileSyncComponentsFactoryImpl(profile,
1918 CommandLine::ForCurrentProcess()), 1918 CommandLine::ForCurrentProcess()),
1919 profile, 1919 profile,
1920 signin, 1920 signin,
1921 behavior); 1921 behavior);
1922 } 1922 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698