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

Side by Side Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/users/chrome_user_manager_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ui/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/audio/sounds.h" 9 #include "ash/audio/sounds.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 lock_container->layer()->SetOpacity(1.0); 577 lock_container->layer()->SetOpacity(1.0);
578 578
579 ash::Shell::GetInstance()-> 579 ash::Shell::GetInstance()->
580 desktop_background_controller()->MoveDesktopToLockedContainer(); 580 desktop_background_controller()->MoveDesktopToLockedContainer();
581 581
582 sign_in_controller_.reset(); // Only one controller in a time. 582 sign_in_controller_.reset(); // Only one controller in a time.
583 sign_in_controller_.reset(new chromeos::ExistingUserController(this)); 583 sign_in_controller_.reset(new chromeos::ExistingUserController(this));
584 SetOobeProgressBarVisible(oobe_progress_bar_visible_ = false); 584 SetOobeProgressBarVisible(oobe_progress_bar_visible_ = false);
585 SetStatusAreaVisible(true); 585 SetStatusAreaVisible(true);
586 sign_in_controller_->Init( 586 sign_in_controller_->Init(
587 user_manager::UserManager::Get()->GetUsersAdmittedForMultiProfile()); 587 user_manager::UserManager::Get()->GetUsersAllowedForMultiProfile());
588 CHECK(webui_login_display_); 588 CHECK(webui_login_display_);
589 GetOobeUI()->ShowSigninScreen(LoginScreenContext(), 589 GetOobeUI()->ShowSigninScreen(LoginScreenContext(),
590 webui_login_display_, 590 webui_login_display_,
591 webui_login_display_); 591 webui_login_display_);
592 } 592 }
593 593
594 void LoginDisplayHostImpl::StartSignInScreen( 594 void LoginDisplayHostImpl::StartSignInScreen(
595 const LoginScreenContext& context) { 595 const LoginScreenContext& context) {
596 if (login::LoginScrollIntoViewEnabled()) 596 if (login::LoginScrollIntoViewEnabled())
597 DisableKeyboardOverscroll(); 597 DisableKeyboardOverscroll();
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1293 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1294 new locale_util::SwitchLanguageCallback( 1294 new locale_util::SwitchLanguageCallback(
1295 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1295 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1296 1296
1297 // Load locale keyboards here. Hardware layout would be automatically enabled. 1297 // Load locale keyboards here. Hardware layout would be automatically enabled.
1298 locale_util::SwitchLanguage( 1298 locale_util::SwitchLanguage(
1299 locale, true, true /* login_layouts_only */, callback.Pass()); 1299 locale, true, true /* login_layouts_only */, callback.Pass());
1300 } 1300 }
1301 1301
1302 } // namespace chromeos 1302 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/users/chrome_user_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698