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

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

Issue 1535573002: 1) Add initialization error page; 2) Add connection error page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: We don't need to set enrollment related local state for a host device since Enrollment Screen doesn… Created 5 years 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/ui/webui/chromeos/login/host_pairing_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 9 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
10 #include "chromeos/chromeos_switches.h" 10 #include "chromeos/chromeos_switches.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 builder->Add(prefix + "UpdatingTitle", IDS_PAIRING_HOST_UPDATING_TITLE); 72 builder->Add(prefix + "UpdatingTitle", IDS_PAIRING_HOST_UPDATING_TITLE);
73 builder->Add(prefix + "UpdatingText", IDS_PAIRING_HOST_UPDATING_TEXT); 73 builder->Add(prefix + "UpdatingText", IDS_PAIRING_HOST_UPDATING_TEXT);
74 builder->Add(prefix + "EnrollTitle", IDS_PAIRING_ENROLL_TITLE); 74 builder->Add(prefix + "EnrollTitle", IDS_PAIRING_ENROLL_TITLE);
75 builder->Add(prefix + "EnrollingTitle", 75 builder->Add(prefix + "EnrollingTitle",
76 IDS_PAIRING_ENROLLMENT_IN_PROGRESS); 76 IDS_PAIRING_ENROLLMENT_IN_PROGRESS);
77 builder->Add(prefix + "DoneTitle", IDS_PAIRING_HOST_DONE_TITLE); 77 builder->Add(prefix + "DoneTitle", IDS_PAIRING_HOST_DONE_TITLE);
78 builder->Add(prefix + "DoneText", IDS_PAIRING_HOST_DONE_TEXT); 78 builder->Add(prefix + "DoneText", IDS_PAIRING_HOST_DONE_TEXT);
79 builder->Add(prefix + "EnrollmentErrorTitle", 79 builder->Add(prefix + "EnrollmentErrorTitle",
80 IDS_PAIRING_ENROLLMENT_ERROR_TITLE); 80 IDS_PAIRING_ENROLLMENT_ERROR_TITLE);
81 builder->Add(prefix + "ErrorNeedsRestart", 81 builder->Add(prefix + "ErrorNeedsRestart",
82 IDS_PAIRING_HOST_EROLLMENT_ERROR_NEEDS_RESTART); 82 IDS_PAIRING_HOST_ERROR_NEED_RESTART_TEXT);
83 builder->Add(prefix + "SetupBasicConfigTitle", 83 builder->Add(prefix + "SetupBasicConfigTitle",
84 IDS_HOST_SETUP_BASIC_CONFIGURATION_TITLE); 84 IDS_HOST_SETUP_BASIC_CONFIGURATION_TITLE);
85 builder->Add(prefix + "SetupNetworkErrorTitle", 85 builder->Add(prefix + "SetupNetworkErrorTitle",
86 IDS_HOST_SETUP_NETWORK_ERROR_TITLE); 86 IDS_HOST_SETUP_NETWORK_ERROR_TITLE);
87 builder->Add(prefix + "InitializationErrorTitle",
88 IDS_PAIRING_HOST_INITIALIZATION_ERROR_TITLE);
89 builder->Add(prefix + "ConnectionErrorTitle",
90 IDS_PAIRING_HOST_CONNECTION_ERROR_TITLE);
91 builder->Add(prefix + "ErrorNeedRestartText",
92 IDS_PAIRING_HOST_ERROR_NEED_RESTART_TEXT);
93 builder->Add(prefix + "ErrorNeedsRestart",
94 IDS_PAIRING_HOST_ERROR_NEED_RESTART_TEXT);
87 95
88 if (IsBootstrappingSlave()) { 96 if (IsBootstrappingSlave()) {
89 builder->Add(prefix + "ConfirmationTitle", IDS_SLAVE_CONFIRMATION_TITLE); 97 builder->Add(prefix + "ConfirmationTitle", IDS_SLAVE_CONFIRMATION_TITLE);
90 builder->Add(prefix + "EnrollTitle", IDS_SLAVE_ENROLL_TITLE); 98 builder->Add(prefix + "EnrollTitle", IDS_SLAVE_ENROLL_TITLE);
91 builder->Add(prefix + "EnrollingTitle", IDS_SLAVE_ENROLLMENT_IN_PROGRESS); 99 builder->Add(prefix + "EnrollingTitle", IDS_SLAVE_ENROLLMENT_IN_PROGRESS);
92 builder->Add(prefix + "EnrollmentErrorTitle", 100 builder->Add(prefix + "EnrollmentErrorTitle",
93 IDS_SLAVE_ENROLLMENT_ERROR_TITLE); 101 IDS_SLAVE_ENROLLMENT_ERROR_TITLE);
94 builder->Add(prefix + "ErrorNeedsRestart",
95 IDS_SLAVE_EROLLMENT_ERROR_NEEDS_RESTART);
96 } 102 }
97 } 103 }
98 104
99 void HostPairingScreenHandler::RegisterMessages() { 105 void HostPairingScreenHandler::RegisterMessages() {
100 AddPrefixedCallback(kCallbackContextReady, 106 AddPrefixedCallback(kCallbackContextReady,
101 &HostPairingScreenHandler::HandleContextReady); 107 &HostPairingScreenHandler::HandleContextReady);
102 } 108 }
103 109
104 void HostPairingScreenHandler::Show() { 110 void HostPairingScreenHandler::Show() {
105 if (!page_is_ready()) { 111 if (!page_is_ready()) {
(...skipping 15 matching lines...) Expand all
121 void HostPairingScreenHandler::OnContextChanged( 127 void HostPairingScreenHandler::OnContextChanged(
122 const base::DictionaryValue& diff) { 128 const base::DictionaryValue& diff) {
123 if (!js_context_ready_) { 129 if (!js_context_ready_) {
124 context_cache_.ApplyChanges(diff, NULL); 130 context_cache_.ApplyChanges(diff, NULL);
125 return; 131 return;
126 } 132 }
127 CallJS(kMethodContextChanged, diff); 133 CallJS(kMethodContextChanged, diff);
128 } 134 }
129 135
130 } // namespace chromeos 136 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698