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

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 18856014: We should switch the keyboard layout to the layout the user set according to (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Diff versus master. Created 7 years, 5 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 138 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
139 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 139 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
140 #include "chrome/browser/chromeos/policy/device_status_collector.h" 140 #include "chrome/browser/chromeos/policy/device_status_collector.h"
141 #include "chrome/browser/chromeos/power/power_prefs.h" 141 #include "chrome/browser/chromeos/power/power_prefs.h"
142 #include "chrome/browser/chromeos/preferences.h" 142 #include "chrome/browser/chromeos/preferences.h"
143 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 143 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
144 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 144 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
145 #include "chrome/browser/chromeos/status/data_promo_notification.h" 145 #include "chrome/browser/chromeos/status/data_promo_notification.h"
146 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 146 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
147 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 147 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
148 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
148 #else 149 #else
149 #include "chrome/browser/extensions/default_apps.h" 150 #include "chrome/browser/extensions/default_apps.h"
150 #endif 151 #endif
151 152
152 #if defined(USE_ASH) 153 #if defined(USE_ASH)
153 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 154 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
154 #endif 155 #endif
155 156
156 #if defined(OS_ANDROID) 157 #if defined(OS_ANDROID)
157 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h" 158 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 256 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
256 chromeos::device_settings_cache::RegisterPrefs(registry); 257 chromeos::device_settings_cache::RegisterPrefs(registry);
257 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); 258 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry);
258 chromeos::language_prefs::RegisterPrefs(registry); 259 chromeos::language_prefs::RegisterPrefs(registry);
259 chromeos::KioskAppManager::RegisterPrefs(registry); 260 chromeos::KioskAppManager::RegisterPrefs(registry);
260 chromeos::LoginUtils::RegisterPrefs(registry); 261 chromeos::LoginUtils::RegisterPrefs(registry);
261 chromeos::Preferences::RegisterPrefs(registry); 262 chromeos::Preferences::RegisterPrefs(registry);
262 chromeos::proxy_config::RegisterPrefs(registry); 263 chromeos::proxy_config::RegisterPrefs(registry);
263 chromeos::RegisterDisplayLocalStatePrefs(registry); 264 chromeos::RegisterDisplayLocalStatePrefs(registry);
264 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 265 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
266 chromeos::SigninScreenHandler::RegisterPrefs(registry);
265 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 267 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
266 chromeos::UserImageManager::RegisterPrefs(registry); 268 chromeos::UserImageManager::RegisterPrefs(registry);
267 chromeos::UserManager::RegisterPrefs(registry); 269 chromeos::UserManager::RegisterPrefs(registry);
268 chromeos::WallpaperManager::RegisterPrefs(registry); 270 chromeos::WallpaperManager::RegisterPrefs(registry);
269 chromeos::StartupUtils::RegisterPrefs(registry); 271 chromeos::StartupUtils::RegisterPrefs(registry);
270 policy::AutoEnrollmentClient::RegisterPrefs(registry); 272 policy::AutoEnrollmentClient::RegisterPrefs(registry);
271 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); 273 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);
272 policy::DeviceStatusCollector::RegisterPrefs(registry); 274 policy::DeviceStatusCollector::RegisterPrefs(registry);
273 #endif 275 #endif
274 276
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 } 490 }
489 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 491 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
490 492
491 current_version |= GOOGLE_URL_TRACKER_PREFS; 493 current_version |= GOOGLE_URL_TRACKER_PREFS;
492 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 494 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
493 current_version); 495 current_version);
494 } 496 }
495 } 497 }
496 498
497 } // namespace chrome 499 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698