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

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: Fix clang build. 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 135 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
136 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 136 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
137 #include "chrome/browser/chromeos/policy/device_status_collector.h" 137 #include "chrome/browser/chromeos/policy/device_status_collector.h"
138 #include "chrome/browser/chromeos/preferences.h" 138 #include "chrome/browser/chromeos/preferences.h"
139 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 139 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
140 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 140 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
141 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 141 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
142 #include "chrome/browser/chromeos/status/data_promo_notification.h" 142 #include "chrome/browser/chromeos/status/data_promo_notification.h"
143 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 143 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
144 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 144 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
145 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
145 #else 146 #else
146 #include "chrome/browser/extensions/default_apps.h" 147 #include "chrome/browser/extensions/default_apps.h"
147 #endif 148 #endif
148 149
149 #if defined(USE_ASH) 150 #if defined(USE_ASH)
150 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 151 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
151 #endif 152 #endif
152 153
153 #if !defined(OS_ANDROID) 154 #if !defined(OS_ANDROID)
154 #include "chrome/browser/chrome_to_mobile_service.h" 155 #include "chrome/browser/chrome_to_mobile_service.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry); 258 chromeos::DeviceOAuth2TokenService::RegisterPrefs(registry);
258 chromeos::device_settings_cache::RegisterPrefs(registry); 259 chromeos::device_settings_cache::RegisterPrefs(registry);
259 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry); 260 chromeos::default_pinned_apps_field_trial::RegisterPrefs(registry);
260 chromeos::language_prefs::RegisterPrefs(registry); 261 chromeos::language_prefs::RegisterPrefs(registry);
261 chromeos::KioskAppManager::RegisterPrefs(registry); 262 chromeos::KioskAppManager::RegisterPrefs(registry);
262 chromeos::LoginUtils::RegisterPrefs(registry); 263 chromeos::LoginUtils::RegisterPrefs(registry);
263 chromeos::Preferences::RegisterPrefs(registry); 264 chromeos::Preferences::RegisterPrefs(registry);
264 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry); 265 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry);
265 chromeos::RegisterDisplayLocalStatePrefs(registry); 266 chromeos::RegisterDisplayLocalStatePrefs(registry);
266 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 267 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
268 chromeos::SigninScreenHandler::RegisterPrefs(registry);
267 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 269 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
268 chromeos::UserImageManager::RegisterPrefs(registry); 270 chromeos::UserImageManager::RegisterPrefs(registry);
269 chromeos::UserManager::RegisterPrefs(registry); 271 chromeos::UserManager::RegisterPrefs(registry);
270 chromeos::WallpaperManager::RegisterPrefs(registry); 272 chromeos::WallpaperManager::RegisterPrefs(registry);
271 chromeos::StartupUtils::RegisterPrefs(registry); 273 chromeos::StartupUtils::RegisterPrefs(registry);
272 policy::AutoEnrollmentClient::RegisterPrefs(registry); 274 policy::AutoEnrollmentClient::RegisterPrefs(registry);
273 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); 275 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);
274 policy::DeviceStatusCollector::RegisterPrefs(registry); 276 policy::DeviceStatusCollector::RegisterPrefs(registry);
275 #endif 277 #endif
276 278
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 } 476 }
475 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 477 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
476 478
477 current_version |= GOOGLE_URL_TRACKER_PREFS; 479 current_version |= GOOGLE_URL_TRACKER_PREFS;
478 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 480 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
479 current_version); 481 current_version);
480 } 482 }
481 } 483 }
482 484
483 } // namespace chrome 485 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698