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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 620563002: ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 6 years, 2 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
Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index 20fae60e2a2617cb30a95ebe686a0bd3aa1256e5..cefef07363fd9a0405c512796f13cad82b223c7b 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -199,11 +199,10 @@ struct ShowLoginWizardSwitchLanguageCallbackData {
void OnLanguageSwitchedCallback(
scoped_ptr<ShowLoginWizardSwitchLanguageCallbackData> self,
- const std::string& locale,
- const std::string& loaded_locale,
- const bool success) {
- if (!success)
- LOG(WARNING) << "Locale could not be found for '" << locale << "'";
+ scoped_ptr<chromeos::locale_util::LanguageSwitchResult> result) {
+ if (!result->success)
+ LOG(WARNING) << "Locale could not be found for '"
+ << result->requested_locale << "'";
ShowLoginWizardFinish(
self->first_screen_name, self->startup_manifest, self->display_host);

Powered by Google App Engine
This is Rietveld 408576698