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

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

Issue 76333002: Add Sync datatype for shared managed user settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years 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 1585 matching lines...) Expand 10 before | Expand all | Expand 10 after
1596 browser_sync::user_selectable_type::PREFERENCES, 1596 browser_sync::user_selectable_type::PREFERENCES,
1597 browser_sync::user_selectable_type::PASSWORDS, 1597 browser_sync::user_selectable_type::PASSWORDS,
1598 browser_sync::user_selectable_type::AUTOFILL, 1598 browser_sync::user_selectable_type::AUTOFILL,
1599 browser_sync::user_selectable_type::THEMES, 1599 browser_sync::user_selectable_type::THEMES,
1600 browser_sync::user_selectable_type::TYPED_URLS, 1600 browser_sync::user_selectable_type::TYPED_URLS,
1601 browser_sync::user_selectable_type::EXTENSIONS, 1601 browser_sync::user_selectable_type::EXTENSIONS,
1602 browser_sync::user_selectable_type::APPS, 1602 browser_sync::user_selectable_type::APPS,
1603 browser_sync::user_selectable_type::PROXY_TABS 1603 browser_sync::user_selectable_type::PROXY_TABS
1604 }; 1604 };
1605 1605
1606 COMPILE_ASSERT(29 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); 1606 COMPILE_ASSERT(30 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);
1607 1607
1608 if (!sync_everything) { 1608 if (!sync_everything) {
1609 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); 1609 const syncer::ModelTypeSet current_types = GetPreferredDataTypes();
1610 1610
1611 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); 1611 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes();
1612 syncer::ModelTypeSet::Iterator it = type_set.First(); 1612 syncer::ModelTypeSet::Iterator it = type_set.First();
1613 1613
1614 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); 1614 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size());
1615 1615
1616 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good(); 1616 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good();
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
2252 SyncTokenStatus status; 2252 SyncTokenStatus status;
2253 status.connection_status_update_time = connection_status_update_time_; 2253 status.connection_status_update_time = connection_status_update_time_;
2254 status.connection_status = connection_status_; 2254 status.connection_status = connection_status_;
2255 status.token_request_time = token_request_time_; 2255 status.token_request_time = token_request_time_;
2256 status.token_receive_time = token_receive_time_; 2256 status.token_receive_time = token_receive_time_;
2257 status.last_get_token_error = last_get_token_error_; 2257 status.last_get_token_error = last_get_token_error_;
2258 if (request_access_token_retry_timer_.IsRunning()) 2258 if (request_access_token_retry_timer_.IsRunning())
2259 status.next_token_request_time = next_token_request_time_; 2259 status.next_token_request_time = next_token_request_time_;
2260 return status; 2260 return status;
2261 } 2261 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698