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

Side by Side Diff: chrome/browser/chromeos/login/user_manager_impl.cc

Issue 117263002: Prevent ONC-pushed certificates from being used with multiprofiles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Philipps suggestion, another test 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/login/user_manager_impl.h" 5 #include "chrome/browser/chromeos/login/user_manager_impl.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after
1373 prefs_display_name_update->RemoveWithoutPathExpansion(user_id, NULL); 1373 prefs_display_name_update->RemoveWithoutPathExpansion(user_id, NULL);
1374 1374
1375 DictionaryPrefUpdate prefs_given_name_update(prefs, kUserGivenName); 1375 DictionaryPrefUpdate prefs_given_name_update(prefs, kUserGivenName);
1376 prefs_given_name_update->RemoveWithoutPathExpansion(user_id, NULL); 1376 prefs_given_name_update->RemoveWithoutPathExpansion(user_id, NULL);
1377 1377
1378 DictionaryPrefUpdate prefs_display_email_update(prefs, kUserDisplayEmail); 1378 DictionaryPrefUpdate prefs_display_email_update(prefs, kUserDisplayEmail);
1379 prefs_display_email_update->RemoveWithoutPathExpansion(user_id, NULL); 1379 prefs_display_email_update->RemoveWithoutPathExpansion(user_id, NULL);
1380 1380
1381 supervised_user_manager_->RemoveNonCryptohomeData(user_id); 1381 supervised_user_manager_->RemoveNonCryptohomeData(user_id);
1382 1382
1383 multi_profile_user_controller_->RemoveCachedValue(user_id); 1383 multi_profile_user_controller_->RemoveCachedValues(user_id);
1384 } 1384 }
1385 1385
1386 User* UserManagerImpl::RemoveRegularOrLocallyManagedUserFromList( 1386 User* UserManagerImpl::RemoveRegularOrLocallyManagedUserFromList(
1387 const std::string& user_id) { 1387 const std::string& user_id) {
1388 ListPrefUpdate prefs_users_update(g_browser_process->local_state(), 1388 ListPrefUpdate prefs_users_update(g_browser_process->local_state(),
1389 kRegularUsers); 1389 kRegularUsers);
1390 prefs_users_update->Clear(); 1390 prefs_users_update->Clear();
1391 User* user = NULL; 1391 User* user = NULL;
1392 for (UserList::iterator it = users_.begin(); it != users_.end(); ) { 1392 for (UserList::iterator it = users_.begin(); it != users_.end(); ) {
1393 const std::string user_email = (*it)->email(); 1393 const std::string user_email = (*it)->email();
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
1815 1815
1816 void UserManagerImpl::DoUpdateAccountLocale( 1816 void UserManagerImpl::DoUpdateAccountLocale(
1817 const std::string& user_id, 1817 const std::string& user_id,
1818 const std::string& resolved_locale) { 1818 const std::string& resolved_locale) {
1819 if (User* user = FindUserAndModify(user_id)) 1819 if (User* user = FindUserAndModify(user_id))
1820 user->SetAccountLocale(resolved_locale); 1820 user->SetAccountLocale(resolved_locale);
1821 } 1821 }
1822 1822
1823 1823
1824 } // namespace chromeos 1824 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698