ash: Use enum for SessionController::CycleActiveUser

chrome/browser/ui/ash/session_controller_client.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/session_controller_client.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/public/cpp/session_types.h"
@@ skipping 92 matching lines @@
 }
 
 void SessionControllerClient::RequestLockScreen() {
   DoLockScreen();
 }
 
 void SessionControllerClient::SwitchActiveUser(const AccountId& account_id) {
   DoSwitchActiveUser(account_id);
 }
 
-void SessionControllerClient::CycleActiveUser(bool next_user) {
-  DoCycleActiveUser(next_user);
+void SessionControllerClient::CycleActiveUser(ash::CycleUser cycle_user) {
+  DoCycleActiveUser(cycle_user);
 }
 
 void SessionControllerClient::ActiveUserChanged(const User* active_user) {
   SendSessionInfoIfChanged();
 
   // UserAddedToSession is not called for the primary user session so send its
   // meta data here once.
   if (!primary_user_session_sent_ &&
       UserManager::Get()->GetPrimaryUser() == active_user) {
     primary_user_session_sent_ = true;
@@ skipping 65 matching lines @@
 // static
 void SessionControllerClient::DoSwitchActiveUser(const AccountId& account_id) {
   // Disallow switching to an already active user since that might crash.
   if (account_id == UserManager::Get()->GetActiveUser()->GetAccountId())
     return;
 
   TrySwitchingActiveUser(base::Bind(&DoSwitchUser, account_id));
 }
 
 // static
-void SessionControllerClient::DoCycleActiveUser(bool next_user) {
+void SessionControllerClient::DoCycleActiveUser(ash::CycleUser cycle_user) {
   const UserList& logged_in_users = UserManager::Get()->GetLoggedInUsers();
   if (logged_in_users.size() <= 1)
     return;
 
   AccountId account_id = UserManager::Get()->GetActiveUser()->GetAccountId();
 
   // Get an iterator positioned at the active user.
   auto it = std::find_if(logged_in_users.begin(), logged_in_users.end(),
                          [account_id](const User* user) {
                            return user->GetAccountId() == account_id;
                          });
 
   // Active user not found.
   if (it == logged_in_users.end())
     return;
 
   // Get the user's email to select, wrapping to the start/end of the list if
   // necessary.
-  if (next_user) {
+  if (cycle_user == ash::CycleUser::CYCLE_TO_NEXT_USER) {
     if (++it == logged_in_users.end())
       account_id = (*logged_in_users.begin())->GetAccountId();
     else
       account_id = (*it)->GetAccountId();
-  } else {
+  } else if (cycle_user == ash::CycleUser::CYCLE_TO_NEXT_USER) {
     if (it == logged_in_users.begin())
       it = logged_in_users.end();
     account_id = (*(--it))->GetAccountId();
+  } else {
+    NOTREACHED() << "Invalid cycle_user=" << static_cast<int>(cycle_user);
+    return;
   }
 
   DoSwitchActiveUser(account_id);
 }
 
 // static
 void SessionControllerClient::FlushForTesting() {
   g_instance->session_controller_.FlushForTesting();
 }
 
@@ skipping 44 matching lines @@
   const UserList logged_in_users = user_manager->GetLoggedInUsers();
   std::vector<uint32_t> user_session_ids;
   for (auto* user : user_manager->GetLRULoggedInUsers()) {
     const uint32_t user_session_id = GetSessionId(*user);
     DCHECK_NE(0u, user_session_id);
     user_session_ids.push_back(user_session_id);
   }
 
   session_controller_->SetUserSessionOrder(user_session_ids);
 }