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

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

Issue 12330137: Allow normal users to change per session flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix include for a moved file. Created 7 years, 9 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
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/resources/flags.css » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 #endif 338 #endif
339 339
340 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 340 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
341 default_apps::RegisterUserPrefs(registry); 341 default_apps::RegisterUserPrefs(registry);
342 #endif 342 #endif
343 343
344 #if defined(OS_CHROMEOS) 344 #if defined(OS_CHROMEOS)
345 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry); 345 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry);
346 chromeos::Preferences::RegisterUserPrefs(registry); 346 chromeos::Preferences::RegisterUserPrefs(registry);
347 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry); 347 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry);
348 FlagsUI::RegisterUserPrefs(registry);
348 #endif 349 #endif
349 350
350 #if defined(OS_WIN) 351 #if defined(OS_WIN)
351 NetworkProfileBubble::RegisterUserPrefs(registry); 352 NetworkProfileBubble::RegisterUserPrefs(registry);
352 #endif 353 #endif
353 354
354 // Prefs registered only for migration (clearing or moving to a new 355 // Prefs registered only for migration (clearing or moving to a new
355 // key) go here. 356 // key) go here.
356 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(), 357 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(),
357 PrefRegistrySyncable::UNSYNCABLE_PREF); 358 PrefRegistrySyncable::UNSYNCABLE_PREF);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 } 433 }
433 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 434 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
434 435
435 current_version |= GOOGLE_URL_TRACKER_PREFS; 436 current_version |= GOOGLE_URL_TRACKER_PREFS;
436 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 437 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
437 current_version); 438 current_version);
438 } 439 }
439 } 440 }
440 441
441 } // namespace chrome 442 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/resources/flags.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698