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

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: Adressed comments. 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
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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 #endif 343 #endif
344 344
345 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 345 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
346 default_apps::RegisterUserPrefs(registry); 346 default_apps::RegisterUserPrefs(registry);
347 #endif 347 #endif
348 348
349 #if defined(OS_CHROMEOS) 349 #if defined(OS_CHROMEOS)
350 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry); 350 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry);
351 chromeos::Preferences::RegisterUserPrefs(registry); 351 chromeos::Preferences::RegisterUserPrefs(registry);
352 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry); 352 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry);
353 FlagsUI::RegisterUserPrefs(registry);
353 #endif 354 #endif
354 355
355 #if defined(OS_WIN) 356 #if defined(OS_WIN)
356 NetworkProfileBubble::RegisterUserPrefs(registry); 357 NetworkProfileBubble::RegisterUserPrefs(registry);
357 #endif 358 #endif
358 359
359 // Prefs registered only for migration (clearing or moving to a new 360 // Prefs registered only for migration (clearing or moving to a new
360 // key) go here. 361 // key) go here.
361 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(), 362 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(),
362 PrefRegistrySyncable::UNSYNCABLE_PREF); 363 PrefRegistrySyncable::UNSYNCABLE_PREF);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 } 438 }
438 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 439 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
439 440
440 current_version |= GOOGLE_URL_TRACKER_PREFS; 441 current_version |= GOOGLE_URL_TRACKER_PREFS;
441 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 442 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
442 current_version); 443 current_version);
443 } 444 }
444 } 445 }
445 446
446 } // namespace chrome 447 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698