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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 2529103002: Add account_type into AccountId (Closed)
Patch Set: Fix MultiUserWindowManagerChromeOSTest.* Created 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/screens/user_selection_screen.h" 5 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 base::ListValue users_list; 365 base::ListValue users_list;
366 366
367 // TODO(nkostylev): Move to a separate method in UserManager. 367 // TODO(nkostylev): Move to a separate method in UserManager.
368 // http://crbug.com/230852 368 // http://crbug.com/230852
369 bool single_user = users_.size() == 1; 369 bool single_user = users_.size() == 1;
370 bool is_signin_to_add = LoginDisplayHost::default_host() && 370 bool is_signin_to_add = LoginDisplayHost::default_host() &&
371 user_manager::UserManager::Get()->IsUserLoggedIn(); 371 user_manager::UserManager::Get()->IsUserLoggedIn();
372 std::string owner_email; 372 std::string owner_email;
373 chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, 373 chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner,
374 &owner_email); 374 &owner_email);
375 const AccountId owner = 375 const AccountId owner = user_manager::known_user::GetAccountId(
376 user_manager::known_user::GetAccountId(owner_email, std::string()); 376 owner_email, std::string() /* id */, AccountType::UNKNOWN);
377 377
378 policy::BrowserPolicyConnectorChromeOS* connector = 378 policy::BrowserPolicyConnectorChromeOS* connector =
379 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 379 g_browser_process->platform_part()->browser_policy_connector_chromeos();
380 bool is_enterprise_managed = connector->IsEnterpriseManaged(); 380 bool is_enterprise_managed = connector->IsEnterpriseManaged();
381 381
382 const user_manager::UserList users_to_send = 382 const user_manager::UserList users_to_send =
383 PrepareUserListForSending(users_, owner, is_signin_to_add); 383 PrepareUserListForSending(users_, owner, is_signin_to_add);
384 384
385 user_auth_type_map_.clear(); 385 user_auth_type_map_.clear();
386 386
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 // The user profile should exist if and only if this is the lock screen. 570 // The user profile should exist if and only if this is the lock screen.
571 DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN); 571 DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN);
572 572
573 if (!profile) 573 if (!profile)
574 profile = profile_helper->GetSigninProfile(); 574 profile = profile_helper->GetSigninProfile();
575 575
576 return EasyUnlockService::Get(profile); 576 return EasyUnlockService::Get(profile);
577 } 577 }
578 578
579 } // namespace chromeos 579 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698