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

Side by Side Diff: chrome/browser/sync/sync_prefs.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/sync_prefs.h" 5 #include "chrome/browser/sync/sync_prefs.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_member.h" 9 #include "base/prefs/pref_member.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 case syncer::MANAGED_USER_SETTINGS: 334 case syncer::MANAGED_USER_SETTINGS:
335 return prefs::kSyncManagedUserSettings; 335 return prefs::kSyncManagedUserSettings;
336 case syncer::PROXY_TABS: 336 case syncer::PROXY_TABS:
337 return prefs::kSyncTabs; 337 return prefs::kSyncTabs;
338 case syncer::PRIORITY_PREFERENCES: 338 case syncer::PRIORITY_PREFERENCES:
339 return prefs::kSyncPriorityPreferences; 339 return prefs::kSyncPriorityPreferences;
340 case syncer::MANAGED_USERS: 340 case syncer::MANAGED_USERS:
341 return prefs::kSyncManagedUsers; 341 return prefs::kSyncManagedUsers;
342 case syncer::ARTICLES: 342 case syncer::ARTICLES:
343 return prefs::kSyncArticles; 343 return prefs::kSyncArticles;
344 case syncer::MANAGED_USER_SHARED_SETTINGS:
345 return prefs::kSyncManagedUserSharedSettings;
344 default: 346 default:
345 break; 347 break;
346 } 348 }
347 NOTREACHED(); 349 NOTREACHED();
348 return NULL; 350 return NULL;
349 } 351 }
350 352
351 #if defined(OS_CHROMEOS) 353 #if defined(OS_CHROMEOS)
352 std::string SyncPrefs::GetSpareBootstrapToken() const { 354 std::string SyncPrefs::GetSpareBootstrapToken() const {
353 DCHECK(CalledOnValidThread()); 355 DCHECK(CalledOnValidThread());
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 for (PrefGroupsMap::const_iterator i = pref_groups_.begin(); 477 for (PrefGroupsMap::const_iterator i = pref_groups_.begin();
476 i != pref_groups_.end(); ++i) { 478 i != pref_groups_.end(); ++i) {
477 if (types.Has(i->first)) 479 if (types.Has(i->first))
478 types_with_groups.PutAll(i->second); 480 types_with_groups.PutAll(i->second);
479 } 481 }
480 types_with_groups.RetainAll(registered_types); 482 types_with_groups.RetainAll(registered_types);
481 return types_with_groups; 483 return types_with_groups;
482 } 484 }
483 485
484 } // namespace browser_sync 486 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/ui/webui/sync_setup_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698