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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 11633020: Re-enable about:flags on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unflattens CLs Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ff03982f1b7bd080f24abd46834c93b26987db96..4bb5e0a56730961d621dea62a09279d5f744e294 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -151,6 +151,7 @@ void RegisterLocalState(PrefServiceSimple* local_state) {
browser_shutdown::RegisterPrefs(local_state);
chrome::RegisterScreenshotPrefs(local_state);
ExternalProtocolHandler::RegisterPrefs(local_state);
+ FlagsUI::RegisterPrefs(local_state);
geolocation::RegisterPrefs(local_state);
IntranetRedirectDetector::RegisterPrefs(local_state);
KeywordEditorController::RegisterPrefs(local_state);
@@ -162,6 +163,7 @@ void RegisterLocalState(PrefServiceSimple* local_state) {
PromoResourceService::RegisterPrefs(local_state);
SigninManagerFactory::RegisterPrefs(local_state);
SSLConfigServiceManager::RegisterPrefs(local_state);
+ UpgradeDetector::RegisterPrefs(local_state);
Nico 2013/01/12 00:16:55 Is this related?
WebCacheManager::RegisterPrefs(local_state);
#if defined(ENABLE_PLUGINS)
@@ -194,9 +196,7 @@ void RegisterLocalState(PrefServiceSimple* local_state) {
BackgroundModeManager::RegisterPrefs(local_state);
chrome_variations::VariationsService::RegisterPrefs(local_state);
RegisterBrowserPrefs(local_state);
- FlagsUI::RegisterPrefs(local_state);
ManagedMode::RegisterPrefs(local_state);
- UpgradeDetector::RegisterPrefs(local_state);
#endif
#if defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698