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

Unified 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: Resolve yfriedman's comments 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 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 3a885def626255770a7bcd688967700d5d27c714..deb5fe66b782a999146b40689be6955392cee191 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -49,7 +49,6 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
#include "chrome/browser/tabs/pinned_tab_codec.h"
-#include "chrome/browser/task_manager/task_manager.h"
#include "chrome/browser/translate/translate_prefs.h"
#include "chrome/browser/ui/alternate_error_tab_observer.h"
#include "chrome/browser/ui/browser.h"
@@ -103,6 +102,10 @@
#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"
#endif
+#if defined(ENABLE_TASK_MANAGER)
jam 2012/04/02 15:49:28 nit: ditto
+#include "chrome/browser/task_manager/task_manager.h"
+#endif // defined(ENABLE_TASK_MANAGER)
+
namespace browser {
void RegisterLocalState(PrefService* local_state) {
@@ -123,7 +126,6 @@ void RegisterLocalState(PrefService* local_state) {
ProfileInfoCache::RegisterPrefs(local_state);
ProfileManager::RegisterPrefs(local_state);
SSLConfigServiceManager::RegisterPrefs(local_state);
- TaskManager::RegisterPrefs(local_state);
WebCacheManager::RegisterPrefs(local_state);
#if defined(ENABLE_CONFIGURATION_POLICY)
@@ -138,6 +140,10 @@ void RegisterLocalState(PrefService* local_state) {
SafeBrowsingService::RegisterPrefs(local_state);
#endif
+#if defined(ENABLE_TASK_MANAGER)
+ TaskManager::RegisterPrefs(local_state);
+#endif // defined(ENABLE_TASK_MANAGER)
+
#if defined(TOOLKIT_VIEWS)
BrowserView::RegisterBrowserViewPrefs(local_state);
#endif

Powered by Google App Engine
This is Rietveld 408576698