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

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

Issue 15177003: Add Sync data type for managed users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 7 years, 7 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 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after
1466 browser_sync::user_selectable_type::PREFERENCES, 1466 browser_sync::user_selectable_type::PREFERENCES,
1467 browser_sync::user_selectable_type::PASSWORDS, 1467 browser_sync::user_selectable_type::PASSWORDS,
1468 browser_sync::user_selectable_type::AUTOFILL, 1468 browser_sync::user_selectable_type::AUTOFILL,
1469 browser_sync::user_selectable_type::THEMES, 1469 browser_sync::user_selectable_type::THEMES,
1470 browser_sync::user_selectable_type::TYPED_URLS, 1470 browser_sync::user_selectable_type::TYPED_URLS,
1471 browser_sync::user_selectable_type::EXTENSIONS, 1471 browser_sync::user_selectable_type::EXTENSIONS,
1472 browser_sync::user_selectable_type::APPS, 1472 browser_sync::user_selectable_type::APPS,
1473 browser_sync::user_selectable_type::PROXY_TABS 1473 browser_sync::user_selectable_type::PROXY_TABS
1474 }; 1474 };
1475 1475
1476 COMPILE_ASSERT(27 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram); 1476 COMPILE_ASSERT(28 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);
1477 1477
1478 if (!sync_everything) { 1478 if (!sync_everything) {
1479 const syncer::ModelTypeSet current_types = GetPreferredDataTypes(); 1479 const syncer::ModelTypeSet current_types = GetPreferredDataTypes();
1480 1480
1481 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes(); 1481 syncer::ModelTypeSet type_set = syncer::UserSelectableTypes();
1482 syncer::ModelTypeSet::Iterator it = type_set.First(); 1482 syncer::ModelTypeSet::Iterator it = type_set.First();
1483 1483
1484 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size()); 1484 DCHECK_EQ(arraysize(user_selectable_types), type_set.Size());
1485 1485
1486 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good(); 1486 for (size_t i = 0; i < arraysize(user_selectable_types) && it.Good();
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
2104 #if defined(ENABLE_MANAGED_USERS) 2104 #if defined(ENABLE_MANAGED_USERS)
2105 if (ManagedUserService::ProfileIsManaged(profile_)) { 2105 if (ManagedUserService::ProfileIsManaged(profile_)) {
2106 DCHECK_EQ(std::string(), signin_->GetAuthenticatedUsername()); 2106 DCHECK_EQ(std::string(), signin_->GetAuthenticatedUsername());
2107 return ManagedUserService::GetManagedUserPseudoEmail(); 2107 return ManagedUserService::GetManagedUserPseudoEmail();
2108 } 2108 }
2109 #endif 2109 #endif
2110 2110
2111 return signin_->GetAuthenticatedUsername(); 2111 return signin_->GetAuthenticatedUsername();
2112 } 2112 }
2113 2113
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/model_association_manager.cc ('k') | chrome/browser/sync/sync_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698