| Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| index 106521af27755abdf39b2c5aaf1ecbdfe238e47c..1b247e7517b6ed7a4cf4ece8ac3e4e8062982237 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| @@ -21,6 +21,7 @@
|
| #include "chrome/browser/chromeos/input_method/xkeyboard.h"
|
| #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
|
| #include "chrome/browser/chromeos/login/authenticator.h"
|
| +#include "chrome/browser/chromeos/login/base_login_display_host.h"
|
| #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
|
| #include "chrome/browser/chromeos/login/screen_locker.h"
|
| #include "chrome/browser/chromeos/login/user.h"
|
| @@ -331,6 +332,8 @@ void SigninScreenHandler::GetLocalizedStrings(
|
| l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_TITLE));
|
| localized_strings->SetString("captivePortalMessage",
|
| l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL));
|
| + localized_strings->SetString("captivePortalProxyMessage",
|
| + l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_PROXY));
|
| localized_strings->SetString("captivePortalNetworkSelect",
|
| l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_NETWORK_SELECT));
|
| localized_strings->SetString("proxyMessageText",
|
| @@ -476,6 +479,9 @@ void SigninScreenHandler::RegisterMessages() {
|
| web_ui()->RegisterMessageCallback("networkErrorShown",
|
| base::Bind(&SigninScreenHandler::HandleNetworkErrorShown,
|
| base::Unretained(this)));
|
| + web_ui()->RegisterMessageCallback("openProxySettings",
|
| + base::Bind(&SigninScreenHandler::HandleOpenProxySettings,
|
| + base::Unretained(this)));
|
| }
|
|
|
| void SigninScreenHandler::HandleGetUsers(const base::ListValue* args) {
|
| @@ -970,6 +976,10 @@ void SigninScreenHandler::HandleCreateAccount(const base::ListValue* args) {
|
| delegate_->CreateAccount();
|
| }
|
|
|
| +void SigninScreenHandler::HandleOpenProxySettings(const base::ListValue* args) {
|
| + BaseLoginDisplayHost::default_host()->OpenProxySettings();
|
| +}
|
| +
|
| void SigninScreenHandler::StartClearingDnsCache() {
|
| if (dns_clear_task_running_ || !g_browser_process->io_thread())
|
| return;
|
|
|