| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/preferences.h" | 5 #include "chrome/browser/chromeos/preferences.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/autoclick/autoclick_controller.h" | 9 #include "ash/autoclick/autoclick_controller.h" |
| 10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
| 11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/i18n/time_formatting.h" | 13 #include "base/i18n/time_formatting.h" |
| 14 #include "base/metrics/histogram.h" | 14 #include "base/metrics/histogram.h" |
| 15 #include "base/prefs/pref_member.h" | |
| 16 #include "base/prefs/pref_registry_simple.h" | |
| 17 #include "base/prefs/scoped_user_pref_update.h" | |
| 18 #include "base/strings/string_split.h" | 15 #include "base/strings/string_split.h" |
| 19 #include "base/strings/string_util.h" | 16 #include "base/strings/string_util.h" |
| 20 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
| 21 #include "base/sys_info.h" | 18 #include "base/sys_info.h" |
| 22 #include "chrome/browser/browser_process.h" | 19 #include "chrome/browser/browser_process.h" |
| 23 #include "chrome/browser/chrome_notification_types.h" | 20 #include "chrome/browser/chrome_notification_types.h" |
| 24 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 21 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
| 25 #include "chrome/browser/chromeos/drive/file_system_util.h" | 22 #include "chrome/browser/chromeos/drive/file_system_util.h" |
| 26 #include "chrome/browser/chromeos/input_method/input_method_syncer.h" | 23 #include "chrome/browser/chromeos/input_method/input_method_syncer.h" |
| 27 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 24 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 28 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" | 25 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" |
| 29 #include "chrome/browser/chromeos/system/input_device_settings.h" | 26 #include "chrome/browser/chromeos/system/input_device_settings.h" |
| 30 #include "chrome/browser/download/download_prefs.h" | 27 #include "chrome/browser/download/download_prefs.h" |
| 31 #include "chrome/browser/prefs/pref_service_syncable_util.h" | 28 #include "chrome/browser/prefs/pref_service_syncable_util.h" |
| 32 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
| 33 #include "chrome/common/pref_names.h" | 30 #include "chrome/common/pref_names.h" |
| 34 #include "chromeos/chromeos_switches.h" | 31 #include "chromeos/chromeos_switches.h" |
| 35 #include "chromeos/system/statistics_provider.h" | 32 #include "chromeos/system/statistics_provider.h" |
| 36 #include "chromeos/timezone/timezone_resolver.h" | 33 #include "chromeos/timezone/timezone_resolver.h" |
| 37 #include "components/drive/drive_pref_names.h" | 34 #include "components/drive/drive_pref_names.h" |
| 38 #include "components/feedback/tracing_manager.h" | 35 #include "components/feedback/tracing_manager.h" |
| 39 #include "components/pref_registry/pref_registry_syncable.h" | 36 #include "components/pref_registry/pref_registry_syncable.h" |
| 37 #include "components/prefs/pref_member.h" |
| 38 #include "components/prefs/pref_registry_simple.h" |
| 39 #include "components/prefs/scoped_user_pref_update.h" |
| 40 #include "components/syncable_prefs/pref_service_syncable.h" | 40 #include "components/syncable_prefs/pref_service_syncable.h" |
| 41 #include "components/user_manager/known_user.h" | 41 #include "components/user_manager/known_user.h" |
| 42 #include "components/user_manager/user.h" | 42 #include "components/user_manager/user.h" |
| 43 #include "components/user_manager/user_manager.h" | 43 #include "components/user_manager/user_manager.h" |
| 44 #include "content/public/browser/browser_thread.h" | 44 #include "content/public/browser/browser_thread.h" |
| 45 #include "third_party/icu/source/i18n/unicode/timezone.h" | 45 #include "third_party/icu/source/i18n/unicode/timezone.h" |
| 46 #include "ui/base/ime/chromeos/extension_ime_util.h" | 46 #include "ui/base/ime/chromeos/extension_ime_util.h" |
| 47 #include "ui/base/ime/chromeos/ime_keyboard.h" | 47 #include "ui/base/ime/chromeos/ime_keyboard.h" |
| 48 #include "ui/base/ime/chromeos/input_method_manager.h" | 48 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 49 #include "ui/chromeos/accessibility_types.h" | 49 #include "ui/chromeos/accessibility_types.h" |
| (...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 729 touch_hud_projection_enabled_.SetValue(enabled); | 729 touch_hud_projection_enabled_.SetValue(enabled); |
| 730 } | 730 } |
| 731 | 731 |
| 732 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { | 732 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { |
| 733 if (active_user != user_) | 733 if (active_user != user_) |
| 734 return; | 734 return; |
| 735 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); | 735 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); |
| 736 } | 736 } |
| 737 | 737 |
| 738 } // namespace chromeos | 738 } // namespace chromeos |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1658793002:
Update chrome for new prefs location. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master