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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: 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 (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/enrollment/enrollment_screen.h" 5 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } while (0) 45 } while (0)
46 46
47 namespace chromeos { 47 namespace chromeos {
48 48
49 // static 49 // static
50 EnrollmentScreen* EnrollmentScreen::Get(ScreenManager* manager) { 50 EnrollmentScreen* EnrollmentScreen::Get(ScreenManager* manager) {
51 return static_cast<EnrollmentScreen*>( 51 return static_cast<EnrollmentScreen*>(
52 manager->GetScreen(WizardController::kEnrollmentScreenName)); 52 manager->GetScreen(WizardController::kEnrollmentScreenName));
53 } 53 }
54 54
55 EnrollmentScreen::EnrollmentScreen( 55 EnrollmentScreen::EnrollmentScreen(ScreenObserver* observer,
56 ScreenObserver* observer, 56 EnrollmentScreenActor* actor)
57 EnrollmentScreenActor* actor) 57 : BaseScreen(observer),
58 : WizardScreen(observer),
59 shark_controller_(NULL), 58 shark_controller_(NULL),
60 remora_controller_(NULL), 59 remora_controller_(NULL),
61 actor_(actor), 60 actor_(actor),
62 enrollment_mode_(EnrollmentScreenActor::ENROLLMENT_MODE_MANUAL), 61 enrollment_mode_(EnrollmentScreenActor::ENROLLMENT_MODE_MANUAL),
63 enrollment_failed_once_(false), 62 enrollment_failed_once_(false),
64 remora_token_sent_(false), 63 remora_token_sent_(false),
65 weak_ptr_factory_(this) { 64 weak_ptr_factory_(this) {
66 // Init the TPM if it has not been done until now (in debug build we might 65 // Init the TPM if it has not been done until now (in debug build we might
67 // have not done that yet). 66 // have not done that yet).
68 DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership( 67 DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership(
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 sample = policy::kMetricEnrollmentAutoFailed; 450 sample = policy::kMetricEnrollmentAutoFailed;
452 UMA(sample); 451 UMA(sample);
453 } 452 }
454 453
455 void EnrollmentScreen::ShowSigninScreen() { 454 void EnrollmentScreen::ShowSigninScreen() {
456 actor_->Show(); 455 actor_->Show();
457 actor_->ShowSigninScreen(); 456 actor_->ShowSigninScreen();
458 } 457 }
459 458
460 } // namespace chromeos 459 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698