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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/audio/sounds.h" 10 #include "ash/audio/sounds.h"
11 #include "ash/desktop_background/desktop_background_controller.h" 11 #include "ash/desktop_background/desktop_background_controller.h"
12 #include "ash/desktop_background/user_wallpaper_delegate.h" 12 #include "ash/desktop_background/user_wallpaper_delegate.h"
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "ash/shell_window_ids.h" 14 #include "ash/shell_window_ids.h"
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/prefs/pref_service.h"
20 #include "base/strings/string_split.h" 19 #include "base/strings/string_split.h"
21 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
22 #include "base/threading/thread_restrictions.h" 21 #include "base/threading/thread_restrictions.h"
23 #include "base/time/time.h" 22 #include "base/time/time.h"
24 #include "base/trace_event/trace_event.h" 23 #include "base/trace_event/trace_event.h"
25 #include "chrome/browser/browser_process.h" 24 #include "chrome/browser/browser_process.h"
26 #include "chrome/browser/browser_shutdown.h" 25 #include "chrome/browser/browser_shutdown.h"
27 #include "chrome/browser/chrome_notification_types.h" 26 #include "chrome/browser/chrome_notification_types.h"
28 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
29 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 28 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "chromeos/audio/chromeos_sounds.h" 66 #include "chromeos/audio/chromeos_sounds.h"
68 #include "chromeos/chromeos_constants.h" 67 #include "chromeos/chromeos_constants.h"
69 #include "chromeos/chromeos_switches.h" 68 #include "chromeos/chromeos_switches.h"
70 #include "chromeos/dbus/dbus_thread_manager.h" 69 #include "chromeos/dbus/dbus_thread_manager.h"
71 #include "chromeos/dbus/session_manager_client.h" 70 #include "chromeos/dbus/session_manager_client.h"
72 #include "chromeos/login/login_state.h" 71 #include "chromeos/login/login_state.h"
73 #include "chromeos/settings/cros_settings_names.h" 72 #include "chromeos/settings/cros_settings_names.h"
74 #include "chromeos/settings/cros_settings_provider.h" 73 #include "chromeos/settings/cros_settings_provider.h"
75 #include "chromeos/settings/timezone_settings.h" 74 #include "chromeos/settings/timezone_settings.h"
76 #include "chromeos/timezone/timezone_resolver.h" 75 #include "chromeos/timezone/timezone_resolver.h"
76 #include "components/prefs/pref_service.h"
77 #include "components/session_manager/core/session_manager.h" 77 #include "components/session_manager/core/session_manager.h"
78 #include "components/user_manager/user.h" 78 #include "components/user_manager/user.h"
79 #include "components/user_manager/user_manager.h" 79 #include "components/user_manager/user_manager.h"
80 #include "content/public/browser/notification_service.h" 80 #include "content/public/browser/notification_service.h"
81 #include "content/public/browser/notification_types.h" 81 #include "content/public/browser/notification_types.h"
82 #include "content/public/browser/web_contents.h" 82 #include "content/public/browser/web_contents.h"
83 #include "content/public/browser/web_ui.h" 83 #include "content/public/browser/web_ui.h"
84 #include "media/audio/sounds/sounds_manager.h" 84 #include "media/audio/sounds/sounds_manager.h"
85 #include "ui/aura/window.h" 85 #include "ui/aura/window.h"
86 #include "ui/base/ime/chromeos/extension_ime_util.h" 86 #include "ui/base/ime/chromeos/extension_ime_util.h"
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1263 1263
1264 locale_util::SwitchLanguageCallback callback( 1264 locale_util::SwitchLanguageCallback callback(
1265 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data)))); 1265 base::Bind(&OnLanguageSwitchedCallback, base::Passed(std::move(data))));
1266 1266
1267 // Load locale keyboards here. Hardware layout would be automatically enabled. 1267 // Load locale keyboards here. Hardware layout would be automatically enabled.
1268 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */, 1268 locale_util::SwitchLanguage(locale, true, true /* login_layouts_only */,
1269 callback, ProfileManager::GetActiveUserProfile()); 1269 callback, ProfileManager::GetActiveUserProfile());
1270 } 1270 }
1271 1271
1272 } // namespace chromeos 1272 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698