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

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

Issue 2663293002: MD WebUI: Networking polish in OOBE and Settings (Closed)
Patch Set: Rebase 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/eula_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 screen_ = nullptr; 114 screen_ = nullptr;
115 BaseScreenHandler::SetBaseScreen(nullptr); 115 BaseScreenHandler::SetBaseScreen(nullptr);
116 } 116 }
117 117
118 void EulaScreenHandler::DeclareLocalizedValues( 118 void EulaScreenHandler::DeclareLocalizedValues(
119 ::login::LocalizedValuesBuilder* builder) { 119 ::login::LocalizedValuesBuilder* builder) {
120 builder->Add("eulaScreenTitle", IDS_EULA_SCREEN_TITLE); 120 builder->Add("eulaScreenTitle", IDS_EULA_SCREEN_TITLE);
121 builder->Add("eulaScreenAccessibleTitle", IDS_EULA_SCREEN_ACCESSIBLE_TITLE); 121 builder->Add("eulaScreenAccessibleTitle", IDS_EULA_SCREEN_ACCESSIBLE_TITLE);
122 builder->Add("checkboxLogging", IDS_EULA_CHECKBOX_ENABLE_LOGGING); 122 builder->Add("checkboxLogging", IDS_EULA_CHECKBOX_ENABLE_LOGGING);
123 builder->Add("back", IDS_EULA_BACK_BUTTON); 123 builder->Add("back", IDS_EULA_BACK_BUTTON);
124 builder->Add("next", IDS_EULA_NEXT_BUTTON);
124 builder->Add("acceptAgreement", IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON); 125 builder->Add("acceptAgreement", IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON);
125 builder->Add("eulaSystemInstallationSettings", 126 builder->Add("eulaSystemInstallationSettings",
126 IDS_EULA_SYSTEM_SECURITY_SETTING); 127 IDS_EULA_SYSTEM_SECURITY_SETTING);
127 builder->Add("eulaTpmDesc", IDS_EULA_TPM_DESCRIPTION); 128 builder->Add("eulaTpmDesc", IDS_EULA_TPM_DESCRIPTION);
128 builder->Add("eulaTpmKeyDesc", IDS_EULA_TPM_KEY_DESCRIPTION); 129 builder->Add("eulaTpmKeyDesc", IDS_EULA_TPM_KEY_DESCRIPTION);
129 builder->Add("eulaTpmDescPowerwash", IDS_EULA_TPM_KEY_DESCRIPTION_POWERWASH); 130 builder->Add("eulaTpmDescPowerwash", IDS_EULA_TPM_KEY_DESCRIPTION_POWERWASH);
130 builder->Add("eulaTpmBusy", IDS_EULA_TPM_BUSY); 131 builder->Add("eulaTpmBusy", IDS_EULA_TPM_BUSY);
131 builder->Add("eulaSystemInstallationSettingsOkButton", IDS_OK); 132 builder->Add("eulaSystemInstallationSettingsOkButton", IDS_OK);
132 builder->Add("termsOfServiceLoading", IDS_TERMS_OF_SERVICE_SCREEN_LOADING); 133 builder->Add("termsOfServiceLoading", IDS_TERMS_OF_SERVICE_SCREEN_LOADING);
133 #if BUILDFLAG(ENABLE_RLZ) 134 #if BUILDFLAG(ENABLE_RLZ)
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 IDS_ABOUT_VERSION_LICENSE_EULA, 212 IDS_ABOUT_VERSION_LICENSE_EULA,
212 GURL(chrome::kChromeUICreditsURL)); 213 GURL(chrome::kChromeUICreditsURL));
213 } 214 }
214 215
215 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() { 216 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
216 if (screen_) 217 if (screen_)
217 screen_->InitiatePasswordFetch(); 218 screen_->InitiatePasswordFetch();
218 } 219 }
219 220
220 } // namespace chromeos 221 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_welcome.js ('k') | ui/webui/resources/cr_elements/network/cr_network_icon.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698