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

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

Issue 9701006: Don't build the task manager into Android builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 (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/autofill/autofill_manager.h" 8 #include "chrome/browser/autofill/autofill_manager.h"
9 #include "chrome/browser/background/background_mode_manager.h" 9 #include "chrome/browser/background/background_mode_manager.h"
10 #include "chrome/browser/bookmarks/bookmark_model.h" 10 #include "chrome/browser/bookmarks/bookmark_model.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 IntranetRedirectDetector::RegisterPrefs(local_state); 117 IntranetRedirectDetector::RegisterPrefs(local_state);
118 KeywordEditorController::RegisterPrefs(local_state); 118 KeywordEditorController::RegisterPrefs(local_state);
119 ManagedMode::RegisterPrefs(local_state); 119 ManagedMode::RegisterPrefs(local_state);
120 MetricsLog::RegisterPrefs(local_state); 120 MetricsLog::RegisterPrefs(local_state);
121 MetricsService::RegisterPrefs(local_state); 121 MetricsService::RegisterPrefs(local_state);
122 NotificationUIManager::RegisterPrefs(local_state); 122 NotificationUIManager::RegisterPrefs(local_state);
123 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); 123 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state);
124 ProfileInfoCache::RegisterPrefs(local_state); 124 ProfileInfoCache::RegisterPrefs(local_state);
125 ProfileManager::RegisterPrefs(local_state); 125 ProfileManager::RegisterPrefs(local_state);
126 SSLConfigServiceManager::RegisterPrefs(local_state); 126 SSLConfigServiceManager::RegisterPrefs(local_state);
127 TaskManager::RegisterPrefs(local_state);
128 UpgradeDetector::RegisterPrefs(local_state); 127 UpgradeDetector::RegisterPrefs(local_state);
129 WebCacheManager::RegisterPrefs(local_state); 128 WebCacheManager::RegisterPrefs(local_state);
130 129
130 #if defined(ENABLE_TASK_MANAGER)
131 TaskManager::RegisterPrefs(local_state);
132 #endif
133
131 #if defined(ENABLE_CONFIGURATION_POLICY) 134 #if defined(ENABLE_CONFIGURATION_POLICY)
132 policy::CloudPolicySubsystem::RegisterPrefs(local_state); 135 policy::CloudPolicySubsystem::RegisterPrefs(local_state);
133 #endif 136 #endif
134 137
135 #if defined(ENABLE_SAFE_BROWSING) 138 #if defined(ENABLE_SAFE_BROWSING)
136 SafeBrowsingService::RegisterPrefs(local_state); 139 SafeBrowsingService::RegisterPrefs(local_state);
137 #endif 140 #endif
138 141
139 #if defined(TOOLKIT_VIEWS) 142 #if defined(TOOLKIT_VIEWS)
140 BrowserView::RegisterBrowserViewPrefs(local_state); 143 BrowserView::RegisterBrowserViewPrefs(local_state);
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); 263 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
261 } 264 }
262 local_state->ClearPref(prefs::kBrowserWindowPlacement); 265 local_state->ClearPref(prefs::kBrowserWindowPlacement);
263 266
264 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 267 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
265 current_version | WINDOWS_PREFS); 268 current_version | WINDOWS_PREFS);
266 } 269 }
267 } 270 }
268 271
269 } // namespace browser 272 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698