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

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

Issue 13820014: Show online policy on CrOS EULA page (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Set the final URL Created 7 years, 8 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 "chrome/browser/chromeos/login/help_app_launcher.h" 9 #include "chrome/browser/chromeos/login/help_app_launcher.h"
10 #include "chrome/browser/chromeos/login/webui_login_display.h" 10 #include "chrome/browser/chromeos/login/webui_login_display.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 builder->Add("checkboxLogging", IDS_EULA_CHECKBOX_ENABLE_LOGGING); 52 builder->Add("checkboxLogging", IDS_EULA_CHECKBOX_ENABLE_LOGGING);
53 builder->Add("back", IDS_EULA_BACK_BUTTON); 53 builder->Add("back", IDS_EULA_BACK_BUTTON);
54 builder->Add("acceptAgreement", IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON); 54 builder->Add("acceptAgreement", IDS_EULA_ACCEPT_AND_CONTINUE_BUTTON);
55 builder->Add("eulaSystemInstallationSettings", 55 builder->Add("eulaSystemInstallationSettings",
56 IDS_EULA_SYSTEM_SECURITY_SETTING); 56 IDS_EULA_SYSTEM_SECURITY_SETTING);
57 builder->Add("eulaTpmDesc", IDS_EULA_TPM_DESCRIPTION); 57 builder->Add("eulaTpmDesc", IDS_EULA_TPM_DESCRIPTION);
58 builder->Add("eulaTpmKeyDesc", IDS_EULA_TPM_KEY_DESCRIPTION); 58 builder->Add("eulaTpmKeyDesc", IDS_EULA_TPM_KEY_DESCRIPTION);
59 builder->Add("eulaTpmDescPowerwash", IDS_EULA_TPM_KEY_DESCRIPTION_POWERWASH); 59 builder->Add("eulaTpmDescPowerwash", IDS_EULA_TPM_KEY_DESCRIPTION_POWERWASH);
60 builder->Add("eulaTpmBusy", IDS_EULA_TPM_BUSY); 60 builder->Add("eulaTpmBusy", IDS_EULA_TPM_BUSY);
61 builder->Add("eulaSystemInstallationSettingsOkButton", IDS_OK); 61 builder->Add("eulaSystemInstallationSettingsOkButton", IDS_OK);
62 builder->Add("termsOfServiceLoading", IDS_TERMS_OF_SERVICE_SCREEN_LOADING);
62 #if defined(ENABLE_RLZ) 63 #if defined(ENABLE_RLZ)
63 builder->AddF("eulaRlzDesc", 64 builder->AddF("eulaRlzDesc",
64 IDS_EULA_RLZ_DESCRIPTION, 65 IDS_EULA_RLZ_DESCRIPTION,
65 IDS_SHORT_PRODUCT_NAME, 66 IDS_SHORT_PRODUCT_NAME,
66 IDS_PRODUCT_NAME); 67 IDS_PRODUCT_NAME);
67 builder->AddF("eulaRlzEnable", 68 builder->AddF("eulaRlzEnable",
68 IDS_EULA_RLZ_ENABLE, 69 IDS_EULA_RLZ_ENABLE,
69 IDS_SHORT_PRODUCT_OS_NAME); 70 IDS_SHORT_PRODUCT_OS_NAME);
70 #endif 71 #endif
71 } 72 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 help_app_ = new HelpAppLauncher(GetNativeWindow()); 119 help_app_ = new HelpAppLauncher(GetNativeWindow());
119 help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE); 120 help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE);
120 } 121 }
121 122
122 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() { 123 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
123 if (delegate_) 124 if (delegate_)
124 delegate_->InitiatePasswordFetch(); 125 delegate_->InitiatePasswordFetch();
125 } 126 }
126 127
127 } // namespace chromeos 128 } // namespace chromeos
OLDNEW
« chrome/browser/ui/webui/about_ui.cc ('K') | « chrome/browser/ui/webui/about_ui.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698