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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

Issue 2672633005: Rewrite message regarding failure to store DM token (Closed)
Patch Set: Created 3 years, 10 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/ui/webui/chromeos/login/enrollment_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/common/system/chromeos/devicetype_utils.h" 9 #include "ash/common/system/chromeos/devicetype_utils.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 return; 355 return;
356 case policy::EnrollmentStatus::NO_MACHINE_IDENTIFICATION: 356 case policy::EnrollmentStatus::NO_MACHINE_IDENTIFICATION:
357 ShowError(IDS_ENTERPRISE_ENROLLMENT_STATUS_NO_MACHINE_IDENTIFICATION, 357 ShowError(IDS_ENTERPRISE_ENROLLMENT_STATUS_NO_MACHINE_IDENTIFICATION,
358 false); 358 false);
359 return; 359 return;
360 case policy::EnrollmentStatus::ACTIVE_DIRECTORY_POLICY_FETCH_FAILED: 360 case policy::EnrollmentStatus::ACTIVE_DIRECTORY_POLICY_FETCH_FAILED:
361 ShowError(IDS_ENTERPRISE_ENROLLMENT_ERROR_ACTIVE_DIRECTORY_POLICY_FETCH, 361 ShowError(IDS_ENTERPRISE_ENROLLMENT_ERROR_ACTIVE_DIRECTORY_POLICY_FETCH,
362 false); 362 false);
363 return; 363 return;
364 case policy::EnrollmentStatus::DM_TOKEN_STORE_FAILED: 364 case policy::EnrollmentStatus::DM_TOKEN_STORE_FAILED:
365 ShowError(IDS_ENTERPRISE_ENROLLMENT_ERROR_STORE_DM_TOKEN_FAILED, false); 365 ShowError(IDS_ENTERPRISE_ENROLLMENT_ERROR_SAVE_DEVICE_CONF, false);
Thiemo Nagel 2017/02/06 10:01:41 Nit: No abbreviations plz.
Roman Sorokin (ftl) 2017/02/06 10:44:42 Done.
366 return; 366 return;
367 } 367 }
368 NOTREACHED(); 368 NOTREACHED();
369 } 369 }
370 370
371 // EnrollmentScreenHandler BaseScreenHandler implementation ----- 371 // EnrollmentScreenHandler BaseScreenHandler implementation -----
372 372
373 void EnrollmentScreenHandler::Initialize() { 373 void EnrollmentScreenHandler::Initialize() {
374 if (show_on_init_) { 374 if (show_on_init_) {
375 Show(); 375 Show();
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 692
693 ShowScreenWithData(OobeScreen::SCREEN_OOBE_ENROLLMENT, &screen_data); 693 ShowScreenWithData(OobeScreen::SCREEN_OOBE_ENROLLMENT, &screen_data);
694 if (first_show_) { 694 if (first_show_) {
695 first_show_ = false; 695 first_show_ = false;
696 UpdateStateInternal(NetworkError::ERROR_REASON_UPDATE, true); 696 UpdateStateInternal(NetworkError::ERROR_REASON_UPDATE, true);
697 } 697 }
698 histogram_helper_->OnScreenShow(); 698 histogram_helper_->OnScreenShow();
699 } 699 }
700 700
701 } // namespace chromeos 701 } // namespace chromeos
OLDNEW
« chrome/app/chromeos_strings.grdp ('K') | « chrome/app/chromeos_strings.grdp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698