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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 3132023: Add language_prefs namespace to language_preferences.h. (Closed)
Patch Set: address comments Created 10 years, 4 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <gdk/gdk.h> 7 #include <gdk/gdk.h>
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 745 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 SetDeferImeStartup(true); 756 SetDeferImeStartup(true);
757 // Tell the window manager that the user isn't logged in. 757 // Tell the window manager that the user isn't logged in.
758 chromeos::WmIpc::instance()->SetLoggedInProperty(false); 758 chromeos::WmIpc::instance()->SetLoggedInProperty(false);
759 759
760 // Set up keyboards. For example, when |locale| is "en-US", enable US qwerty 760 // Set up keyboards. For example, when |locale| is "en-US", enable US qwerty
761 // and US dvorak keyboard layouts. 761 // and US dvorak keyboard layouts.
762 if (g_browser_process && g_browser_process->local_state()) { 762 if (g_browser_process && g_browser_process->local_state()) {
763 const std::string locale = g_browser_process->GetApplicationLocale(); 763 const std::string locale = g_browser_process->GetApplicationLocale();
764 const std::string initial_input_method_id = 764 const std::string initial_input_method_id =
765 g_browser_process->local_state()->GetString( 765 g_browser_process->local_state()->GetString(
766 chromeos::kPreferredKeyboardLayout); 766 chromeos::language_prefs::kPreferredKeyboardLayout);
767 chromeos::input_method::EnableInputMethods( 767 chromeos::input_method::EnableInputMethods(
768 locale, chromeos::input_method::kKeyboardLayoutsOnly, 768 locale, chromeos::input_method::kKeyboardLayoutsOnly,
769 initial_input_method_id); 769 initial_input_method_id);
770 } 770 }
771 771
772 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(size)); 772 gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(size));
773 773
774 // Check whether we need to execute OOBE process. 774 // Check whether we need to execute OOBE process.
775 bool oobe_complete = WizardController::IsOobeCompleted(); 775 bool oobe_complete = WizardController::IsOobeCompleted();
776 776
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 // user has changed to during OOBE. 834 // user has changed to during OOBE.
835 if (!timezone_name.empty()) { 835 if (!timezone_name.empty()) {
836 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( 836 icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
837 icu::UnicodeString::fromUTF8(timezone_name)); 837 icu::UnicodeString::fromUTF8(timezone_name));
838 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone); 838 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone);
839 } 839 }
840 } 840 }
841 } 841 }
842 842
843 } // namespace browser 843 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.cc ('k') | chrome/browser/chromeos/options/language_chewing_config_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698