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

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

Issue 413133004: Remove unused LoginPerformer::Delegate setter and member. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/existing_user_controller.h" 5 #include "chrome/browser/chromeos/login/existing_user_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 set_host(host_); 440 set_host(host_);
441 441
442 BootTimesLoader::Get()->RecordLoginAttempted(); 442 BootTimesLoader::Get()->RecordLoginAttempted();
443 443
444 // Disable UI while loading user profile. 444 // Disable UI while loading user profile.
445 login_display_->SetUIEnabled(false); 445 login_display_->SetUIEnabled(false);
446 446
447 // Use the same LoginPerformer for subsequent login as it has state 447 // Use the same LoginPerformer for subsequent login as it has state
448 // such as Authenticator instance. 448 // such as Authenticator instance.
449 if (!login_performer_.get() || num_login_attempts_ <= 1) { 449 if (!login_performer_.get() || num_login_attempts_ <= 1) {
450 LoginPerformer::Delegate* delegate = this;
451 if (login_performer_delegate_.get())
452 delegate = login_performer_delegate_.get();
453 // Only one instance of LoginPerformer should exist at a time. 450 // Only one instance of LoginPerformer should exist at a time.
454 login_performer_.reset(NULL); 451 login_performer_.reset(NULL);
455 login_performer_.reset(new LoginPerformer(delegate)); 452 login_performer_.reset(new LoginPerformer(this));
456 } 453 }
457 454
458 is_login_in_progress_ = true; 455 is_login_in_progress_ = true;
459 if (gaia::ExtractDomainName(user_context.GetUserID()) == 456 if (gaia::ExtractDomainName(user_context.GetUserID()) ==
460 chromeos::login::kSupervisedUserDomain) { 457 chromeos::login::kSupervisedUserDomain) {
461 login_performer_->LoginAsSupervisedUser(user_context); 458 login_performer_->LoginAsSupervisedUser(user_context);
462 } else { 459 } else {
463 login_performer_->PerformLogin(user_context, auth_mode); 460 login_performer_->PerformLogin(user_context, auth_mode);
464 } 461 }
465 SendAccessibilityAlert( 462 SendAccessibilityAlert(
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 } 1155 }
1159 1156
1160 void ExistingUserController::SendAccessibilityAlert( 1157 void ExistingUserController::SendAccessibilityAlert(
1161 const std::string& alert_text) { 1158 const std::string& alert_text) {
1162 AccessibilityAlertInfo event(ProfileHelper::GetSigninProfile(), alert_text); 1159 AccessibilityAlertInfo event(ProfileHelper::GetSigninProfile(), alert_text);
1163 SendControlAccessibilityNotification( 1160 SendControlAccessibilityNotification(
1164 ui::AX_EVENT_VALUE_CHANGED, &event); 1161 ui::AX_EVENT_VALUE_CHANGED, &event);
1165 } 1162 }
1166 1163
1167 } // namespace chromeos 1164 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698