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

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

Issue 2771623002: Bootstrapping: Display meaningful enrollment error message on Slave device. (Closed)
Patch Set: Created 3 years, 9 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 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/host_pairing_screen.h" 5 #include "chrome/browser/chromeos/login/screens/host_pairing_screen.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chromeos/login/startup_utils.h" 9 #include "chrome/browser/chromeos/login/startup_utils.h"
10 #include "chrome/browser/chromeos/login/wizard_controller.h" 10 #include "chrome/browser/chromeos/login/wizard_controller.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 99 }
100 case HostPairingController::STAGE_ENROLLMENT_SUCCESS: { 100 case HostPairingController::STAGE_ENROLLMENT_SUCCESS: {
101 remora_controller_->RemoveObserver(this); 101 remora_controller_->RemoveObserver(this);
102 Finish(ScreenExitCode::ENTERPRISE_ENROLLMENT_COMPLETED); 102 Finish(ScreenExitCode::ENTERPRISE_ENROLLMENT_COMPLETED);
103 break; 103 break;
104 } 104 }
105 case HostPairingController::STAGE_ENROLLMENT_ERROR: { 105 case HostPairingController::STAGE_ENROLLMENT_ERROR: {
106 // TODO(xdai): Maybe return to the Network Setup page? 106 // TODO(xdai): Maybe return to the Network Setup page?
107 remora_controller_->RemoveObserver(this); 107 remora_controller_->RemoveObserver(this);
108 desired_page = kPageEnrollmentError; 108 desired_page = kPageEnrollmentError;
109 context_.SetString(kContextKeyEnrollmentError, enrollment_error_string_);
109 break; 110 break;
110 } 111 }
111 default: 112 default:
112 break; 113 break;
113 } 114 }
114 current_stage_ = new_stage; 115 current_stage_ = new_stage;
115 context_.SetString(kContextKeyDeviceName, 116 context_.SetString(kContextKeyDeviceName,
116 remora_controller_->GetDeviceName()); 117 remora_controller_->GetDeviceName());
117 context_.SetString(kContextKeyPage, desired_page); 118 context_.SetString(kContextKeyPage, desired_page);
118 CommitContextChanges(); 119 CommitContextChanges();
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 remora_controller_->OnEnrollmentStatusChanged( 151 remora_controller_->OnEnrollmentStatusChanged(
151 HostPairingController::ENROLLMENT_STATUS_ENROLLING); 152 HostPairingController::ENROLLMENT_STATUS_ENROLLING);
152 } 153 }
153 154
154 void HostPairingScreen::OnViewDestroyed(HostPairingScreenView* view) { 155 void HostPairingScreen::OnViewDestroyed(HostPairingScreenView* view) {
155 if (view_ == view) 156 if (view_ == view)
156 view_ = NULL; 157 view_ = NULL;
157 } 158 }
158 159
159 void HostPairingScreen::OnAuthError(const GoogleServiceAuthError& error) { 160 void HostPairingScreen::OnAuthError(const GoogleServiceAuthError& error) {
161 enrollment_error_string_ = view_->GetErrorStringFromAuthError(error);
160 OnAnyEnrollmentError(); 162 OnAnyEnrollmentError();
161 } 163 }
162 164
163 void HostPairingScreen::OnEnrollmentError(policy::EnrollmentStatus status) { 165 void HostPairingScreen::OnEnrollmentError(policy::EnrollmentStatus status) {
166 enrollment_error_string_ = view_->GetErrorStringFromEnrollmentError(status);
164 OnAnyEnrollmentError(); 167 OnAnyEnrollmentError();
165 } 168 }
166 169
167 void HostPairingScreen::OnOtherError( 170 void HostPairingScreen::OnOtherError(
168 EnterpriseEnrollmentHelper::OtherError error) { 171 EnterpriseEnrollmentHelper::OtherError error) {
172 enrollment_error_string_ = view_->GetErrorStringFromOtherError(error);
169 OnAnyEnrollmentError(); 173 OnAnyEnrollmentError();
170 } 174 }
171 175
172 void HostPairingScreen::OnDeviceEnrolled(const std::string& additional_token) { 176 void HostPairingScreen::OnDeviceEnrolled(const std::string& additional_token) {
173 StartupUtils::MarkDeviceRegistered(base::Bind(&base::DoNothing)); 177 StartupUtils::MarkDeviceRegistered(base::Bind(&base::DoNothing));
174 enrollment_helper_->ClearAuth(base::Bind(&HostPairingScreen::OnAuthCleared, 178 enrollment_helper_->ClearAuth(base::Bind(&HostPairingScreen::OnAuthCleared,
175 weak_ptr_factory_.GetWeakPtr())); 179 weak_ptr_factory_.GetWeakPtr()));
176 180
177 policy::BrowserPolicyConnectorChromeOS* connector = 181 policy::BrowserPolicyConnectorChromeOS* connector =
178 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 182 g_browser_process->platform_part()->browser_policy_connector_chromeos();
(...skipping 14 matching lines...) Expand all
193 } 197 }
194 198
195 void HostPairingScreen::OnAnyEnrollmentError() { 199 void HostPairingScreen::OnAnyEnrollmentError() {
196 enrollment_helper_->ClearAuth(base::Bind(&HostPairingScreen::OnAuthCleared, 200 enrollment_helper_->ClearAuth(base::Bind(&HostPairingScreen::OnAuthCleared,
197 weak_ptr_factory_.GetWeakPtr())); 201 weak_ptr_factory_.GetWeakPtr()));
198 remora_controller_->OnEnrollmentStatusChanged( 202 remora_controller_->OnEnrollmentStatusChanged(
199 HostPairingController::ENROLLMENT_STATUS_FAILURE); 203 HostPairingController::ENROLLMENT_STATUS_FAILURE);
200 } 204 }
201 205
202 } // namespace chromeos 206 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698