diff options
| author | alemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 20:08:43 +0000 |
|---|---|---|
| committer | alemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 20:08:43 +0000 |
| commit | fcb10a48bfc2b89f71d239efa2028a06455d7b89 (patch) | |
| tree | 5924f942f66a6a63ae9d46e1a62ef405bce9ba6f /chrome/chrome_browser_chromeos.gypi | |
| parent | db546e9d54332be583e30a1f0f0a99ba7e6628a2 (diff) | |
| download | chromium_src-fcb10a48bfc2b89f71d239efa2028a06455d7b89.zip chromium_src-fcb10a48bfc2b89f71d239efa2028a06455d7b89.tar.gz chromium_src-fcb10a48bfc2b89f71d239efa2028a06455d7b89.tar.bz2 | |
Reload ResourceBundle on locale change through BlockingPool (no IO on UI thread
anymore).
Move all SwitchLocale() code to chrome/browser/chromeos/base/locale_util.*
(Drop unused language_switch_menu.*)
BUG=126950
TEST=manual
Review URL: https://codereview.chromium.org/27032004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser_chromeos.gypi')
| -rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 10b5beb..0844b7a 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -156,6 +156,8 @@ 'browser/chromeos/background/ash_user_wallpaper_delegate.h', 'browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc', 'browser/chromeos/bluetooth/bluetooth_pairing_dialog.h', + 'browser/chromeos/base/locale_util.cc', + 'browser/chromeos/base/locale_util.h', 'browser/chromeos/boot_times_loader.cc', 'browser/chromeos/boot_times_loader.h', 'browser/chromeos/camera_detector.cc', @@ -478,6 +480,8 @@ 'browser/chromeos/login/enrollment/enrollment_screen_actor.h', 'browser/chromeos/login/existing_user_controller.cc', 'browser/chromeos/login/existing_user_controller.h', + 'browser/chromeos/login/input_events_blocker.h', + 'browser/chromeos/login/input_events_blocker.cc', 'browser/chromeos/login/keyboard_driven_oobe_key_handler.cc', 'browser/chromeos/login/keyboard_driven_oobe_key_handler.h', 'browser/chromeos/login/help_app_launcher.cc', @@ -488,8 +492,6 @@ 'browser/chromeos/login/hwid_checker.h', 'browser/chromeos/login/language_list.cc', 'browser/chromeos/login/language_list.h', - 'browser/chromeos/login/language_switch_menu.cc', - 'browser/chromeos/login/language_switch_menu.h', 'browser/chromeos/login/lock_window.cc', 'browser/chromeos/login/lock_window.h', 'browser/chromeos/login/lock_window_aura.cc', |