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

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

Issue 14314002: Implement new audio handler which talks to the new audio dbus apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browser_tests compiling issue. Created 7 years, 8 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 | Annotate | Revision Log
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/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/about_flags.h" 10 #include "chrome/browser/about_flags.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 125 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
126 #include "chrome/browser/chromeos/login/wizard_controller.h" 126 #include "chrome/browser/chromeos/login/wizard_controller.h"
127 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 127 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
128 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 128 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
129 #include "chrome/browser/chromeos/policy/device_status_collector.h" 129 #include "chrome/browser/chromeos/policy/device_status_collector.h"
130 #include "chrome/browser/chromeos/preferences.h" 130 #include "chrome/browser/chromeos/preferences.h"
131 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 131 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
132 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 132 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
133 #include "chrome/browser/chromeos/status/data_promo_notification.h" 133 #include "chrome/browser/chromeos/status/data_promo_notification.h"
134 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 134 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
135 #include "chromeos/audio/audio_pref_handler.h"
135 #else 136 #else
136 #include "chrome/browser/extensions/default_apps.h" 137 #include "chrome/browser/extensions/default_apps.h"
137 #endif 138 #endif
138 139
139 #if defined(USE_ASH) 140 #if defined(USE_ASH)
140 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 141 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
141 #endif 142 #endif
142 143
143 #if !defined(OS_ANDROID) 144 #if !defined(OS_ANDROID)
144 #include "chrome/browser/chrome_to_mobile_service.h" 145 #include "chrome/browser/chrome_to_mobile_service.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 231
231 #if !defined(OS_ANDROID) 232 #if !defined(OS_ANDROID)
232 BackgroundModeManager::RegisterPrefs(registry); 233 BackgroundModeManager::RegisterPrefs(registry);
233 chrome_variations::VariationsService::RegisterPrefs(registry); 234 chrome_variations::VariationsService::RegisterPrefs(registry);
234 RegisterBrowserPrefs(registry); 235 RegisterBrowserPrefs(registry);
235 RegisterDefaultBrowserPromptPrefs(registry); 236 RegisterDefaultBrowserPromptPrefs(registry);
236 ManagedMode::RegisterPrefs(registry); 237 ManagedMode::RegisterPrefs(registry);
237 #endif 238 #endif
238 239
239 #if defined(OS_CHROMEOS) 240 #if defined(OS_CHROMEOS)
240 chromeos::AudioHandler::RegisterPrefs(registry); 241 chromeos::AudioPrefHandler::RegisterPrefs(registry);
241 chromeos::DataPromoNotification::RegisterPrefs(registry); 242 chromeos::DataPromoNotification::RegisterPrefs(registry);
242 chromeos::device_settings_cache::RegisterPrefs(registry); 243 chromeos::device_settings_cache::RegisterPrefs(registry);
243 chromeos::language_prefs::RegisterPrefs(registry); 244 chromeos::language_prefs::RegisterPrefs(registry);
244 chromeos::KioskAppManager::RegisterPrefs(registry); 245 chromeos::KioskAppManager::RegisterPrefs(registry);
245 chromeos::LoginUtils::RegisterPrefs(registry); 246 chromeos::LoginUtils::RegisterPrefs(registry);
246 chromeos::Preferences::RegisterPrefs(registry); 247 chromeos::Preferences::RegisterPrefs(registry);
247 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry); 248 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry);
248 chromeos::RegisterDisplayLocalStatePrefs(registry); 249 chromeos::RegisterDisplayLocalStatePrefs(registry);
249 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 250 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
250 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 251 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 } 441 }
441 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 442 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
442 443
443 current_version |= GOOGLE_URL_TRACKER_PREFS; 444 current_version |= GOOGLE_URL_TRACKER_PREFS;
444 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 445 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
445 current_version); 446 current_version);
446 } 447 }
447 } 448 }
448 449
449 } // namespace chrome 450 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698