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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 600733004: Rename GetUsersAdmittedForMultiProfile to GetUsersAllowedForMultiProfile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/ui/ash/system_tray_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 return; 553 return;
554 } 554 }
555 555
556 if (static_cast<int>( 556 if (static_cast<int>(
557 user_manager::UserManager::Get()->GetLoggedInUsers().size()) >= 557 user_manager::UserManager::Get()->GetLoggedInUsers().size()) >=
558 shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers()) 558 shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers())
559 return; 559 return;
560 560
561 // Launch sign in screen to add another user to current session. 561 // Launch sign in screen to add another user to current session.
562 if (user_manager::UserManager::Get() 562 if (user_manager::UserManager::Get()
563 ->GetUsersAdmittedForMultiProfile() 563 ->GetUsersAllowedForMultiProfile()
564 .size()) { 564 .size()) {
565 // Don't show dialog if any logged in user in multi-profiles session 565 // Don't show dialog if any logged in user in multi-profiles session
566 // dismissed it. 566 // dismissed it.
567 bool show_intro = true; 567 bool show_intro = true;
568 const user_manager::UserList logged_in_users = 568 const user_manager::UserList logged_in_users =
569 user_manager::UserManager::Get()->GetLoggedInUsers(); 569 user_manager::UserManager::Get()->GetLoggedInUsers();
570 for (user_manager::UserList::const_iterator it = logged_in_users.begin(); 570 for (user_manager::UserList::const_iterator it = logged_in_users.begin();
571 it != logged_in_users.end(); 571 it != logged_in_users.end();
572 ++it) { 572 ++it) {
573 show_intro &= !multi_user_util::GetProfileFromUserID( 573 show_intro &= !multi_user_util::GetProfileFromUserID(
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
1295 accessibility_subscription_.reset(); 1295 accessibility_subscription_.reset();
1296 else 1296 else
1297 OnAccessibilityModeChanged(details.notify); 1297 OnAccessibilityModeChanged(details.notify);
1298 } 1298 }
1299 1299
1300 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1300 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1301 return new SystemTrayDelegateChromeOS(); 1301 return new SystemTrayDelegateChromeOS();
1302 } 1302 }
1303 1303
1304 } // namespace chromeos 1304 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.cc ('k') | components/user_manager/user_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698