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

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

Issue 10873085: Implement two new policies to control muting the audio I/O. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 (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/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 printing::StickySettings::RegisterUserPrefs(user_prefs); 254 printing::StickySettings::RegisterUserPrefs(user_prefs);
255 #endif 255 #endif
256 256
257 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 257 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
258 default_apps::RegisterUserPrefs(user_prefs); 258 default_apps::RegisterUserPrefs(user_prefs);
259 #endif 259 #endif
260 260
261 #if defined(OS_CHROMEOS) 261 #if defined(OS_CHROMEOS)
262 chromeos::Preferences::RegisterUserPrefs(user_prefs); 262 chromeos::Preferences::RegisterUserPrefs(user_prefs);
263 chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs); 263 chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs);
264 chromeos::AudioHandler::RegisterUserPrefs(user_prefs);
264 #endif 265 #endif
265 266
266 #if defined(OS_WIN) 267 #if defined(OS_WIN)
267 NetworkProfileBubble::RegisterPrefs(user_prefs); 268 NetworkProfileBubble::RegisterPrefs(user_prefs);
268 #endif 269 #endif
269 } 270 }
270 271
271 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) { 272 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
272 // Copy pref values which have been migrated to user_prefs from local_state, 273 // Copy pref values which have been migrated to user_prefs from local_state,
273 // or remove them from local_state outright, if copying is not required. 274 // or remove them from local_state outright, if copying is not required.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 } 330 }
330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 331 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
331 332
332 current_version |= GOOGLE_URL_TRACKER_PREFS; 333 current_version |= GOOGLE_URL_TRACKER_PREFS;
333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 334 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
334 current_version); 335 current_version);
335 } 336 }
336 } 337 }
337 338
338 } // namespace chrome 339 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698