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

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

Issue 1055863002: ChromeOS: switch UI language before apps are loaded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove empty line. Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/login/ui/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/audio/sounds.h" 9 #include "ash/audio/sounds.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 StartupUtils::SetInitialLocale(locale); 1275 StartupUtils::SetInitialLocale(locale);
1276 1276
1277 scoped_ptr<ShowLoginWizardSwitchLanguageCallbackData> data( 1277 scoped_ptr<ShowLoginWizardSwitchLanguageCallbackData> data(
1278 new ShowLoginWizardSwitchLanguageCallbackData( 1278 new ShowLoginWizardSwitchLanguageCallbackData(
1279 first_screen_name, startup_manifest, display_host)); 1279 first_screen_name, startup_manifest, display_host));
1280 1280
1281 locale_util::SwitchLanguageCallback callback( 1281 locale_util::SwitchLanguageCallback callback(
1282 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))); 1282 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())));
1283 1283
1284 // Load locale keyboards here. Hardware layout would be automatically enabled. 1284 // Load locale keyboards here. Hardware layout would be automatically enabled.
1285 locale_util::SwitchLanguage( 1285 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */,
1286 locale, true, true /* login_layouts_only */, callback); 1286 callback, ProfileManager::GetActiveUserProfile());
1287 } 1287 }
1288 1288
1289 } // namespace chromeos 1289 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698