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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 10166004: Added a message that suggest to configure a proxy for a network. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed suggestion. Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..4a751d0c14d513133146561cf09bc739aaa0c91c 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
#include "chrome/browser/chromeos/login/authenticator.h"
#include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
+#include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
#include "chrome/browser/chromeos/login/screen_locker.h"
#include "chrome/browser/chromeos/login/user.h"
#include "chrome/browser/chromeos/login/webui_login_display.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,12 @@ void SigninScreenHandler::HandleCreateAccount(const base::ListValue* args) {
delegate_->CreateAccount();
}
+void SigninScreenHandler::HandleOpenProxySettings(const base::ListValue* args) {
+ ProxySettingsDialog* dialog =
Nikita (slow) 2012/04/20 15:09:16 #include "chrome/browser/chromeos/login/base_login
+ new ProxySettingsDialog(NULL, GetNativeWindow());
+ dialog->Show();
+}
+
void SigninScreenHandler::StartClearingDnsCache() {
if (dns_clear_task_running_ || !g_browser_process->io_thread())
return;
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698