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

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

Issue 12968004: Implemented new UI for error messages on OOBE/Login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 9 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/error_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 web_ui()->RegisterMessageCallback("showCaptivePortal", 140 web_ui()->RegisterMessageCallback("showCaptivePortal",
141 base::Bind(&ErrorScreenHandler::HandleShowCaptivePortal, 141 base::Bind(&ErrorScreenHandler::HandleShowCaptivePortal,
142 base::Unretained(this))); 142 base::Unretained(this)));
143 web_ui()->RegisterMessageCallback("hideCaptivePortal", 143 web_ui()->RegisterMessageCallback("hideCaptivePortal",
144 base::Bind(&ErrorScreenHandler::HandleHideCaptivePortal, 144 base::Bind(&ErrorScreenHandler::HandleHideCaptivePortal,
145 base::Unretained(this))); 145 base::Unretained(this)));
146 } 146 }
147 147
148 void ErrorScreenHandler::GetLocalizedStrings( 148 void ErrorScreenHandler::GetLocalizedStrings(
149 base::DictionaryValue* localized_strings) { 149 base::DictionaryValue* localized_strings) {
150 localized_strings->SetString("offlineMessageTitle", 150 localized_strings->SetString("proxyErrorTitle",
151 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_TITLE)); 151 l10n_util::GetStringUTF16(IDS_LOGIN_PROXY_ERROR_TITLE));
152 localized_strings->SetString("offlineMessageBody", 152 localized_strings->SetString("offlineMessageBody",
153 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_MESSAGE)); 153 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_MESSAGE));
154 localized_strings->SetString("captivePortalTitle", 154 localized_strings->SetString("captivePortalTitle",
155 l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_TITLE)); 155 l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_TITLE));
156 localized_strings->SetString("captivePortalMessage", 156 localized_strings->SetString("captivePortalMessage",
157 l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL)); 157 l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL));
158 localized_strings->SetString("captivePortalProxyMessage", 158 localized_strings->SetString("captivePortalProxyMessage",
159 l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_PROXY)); 159 l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_PROXY));
160 localized_strings->SetString("captivePortalNetworkSelect", 160 localized_strings->SetString("captivePortalNetworkSelect",
161 l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_NETWORK_SELECT)); 161 l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL_NETWORK_SELECT));
(...skipping 10 matching lines...) Expand all
172 } 172 }
173 } 173 }
174 174
175 gfx::NativeWindow ErrorScreenHandler::GetNativeWindow() { 175 gfx::NativeWindow ErrorScreenHandler::GetNativeWindow() {
176 if (native_window_delegate_) 176 if (native_window_delegate_)
177 return native_window_delegate_->GetNativeWindow(); 177 return native_window_delegate_->GetNativeWindow();
178 return NULL; 178 return NULL;
179 } 179 }
180 180
181 } // namespace chromeos 181 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698