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

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: Resolve jam's commnents about not ifdef'ing includes Created 8 years, 8 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 GoogleURLTracker::RegisterPrefs(local_state); 116 GoogleURLTracker::RegisterPrefs(local_state);
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 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); 122 PrefProxyConfigTrackerImpl::RegisterPrefs(local_state);
123 ProfileInfoCache::RegisterPrefs(local_state); 123 ProfileInfoCache::RegisterPrefs(local_state);
124 ProfileManager::RegisterPrefs(local_state); 124 ProfileManager::RegisterPrefs(local_state);
125 SSLConfigServiceManager::RegisterPrefs(local_state); 125 SSLConfigServiceManager::RegisterPrefs(local_state);
126 TaskManager::RegisterPrefs(local_state);
127 WebCacheManager::RegisterPrefs(local_state); 126 WebCacheManager::RegisterPrefs(local_state);
128 127
129 #if defined(ENABLE_CONFIGURATION_POLICY) 128 #if defined(ENABLE_CONFIGURATION_POLICY)
130 policy::CloudPolicySubsystem::RegisterPrefs(local_state); 129 policy::CloudPolicySubsystem::RegisterPrefs(local_state);
131 #endif 130 #endif
132 131
133 #if defined(ENABLE_NOTIFICATIONS) 132 #if defined(ENABLE_NOTIFICATIONS)
134 NotificationUIManager::RegisterPrefs(local_state); 133 NotificationUIManager::RegisterPrefs(local_state);
135 #endif 134 #endif
136 135
137 #if defined(ENABLE_SAFE_BROWSING) 136 #if defined(ENABLE_SAFE_BROWSING)
138 SafeBrowsingService::RegisterPrefs(local_state); 137 SafeBrowsingService::RegisterPrefs(local_state);
139 #endif 138 #endif
140 139
140 #if defined(ENABLE_TASK_MANAGER)
141 TaskManager::RegisterPrefs(local_state);
142 #endif // defined(ENABLE_TASK_MANAGER)
143
141 #if defined(TOOLKIT_VIEWS) 144 #if defined(TOOLKIT_VIEWS)
142 BrowserView::RegisterBrowserViewPrefs(local_state); 145 BrowserView::RegisterBrowserViewPrefs(local_state);
143 #endif 146 #endif
144 147
145 #if !defined(OS_ANDROID) 148 #if !defined(OS_ANDROID)
146 BackgroundModeManager::RegisterPrefs(local_state); 149 BackgroundModeManager::RegisterPrefs(local_state);
147 Browser::RegisterPrefs(local_state); 150 Browser::RegisterPrefs(local_state);
148 FlagsUI::RegisterPrefs(local_state); 151 FlagsUI::RegisterPrefs(local_state);
149 NewTabPageHandler::RegisterPrefs(local_state); 152 NewTabPageHandler::RegisterPrefs(local_state);
150 printing::PrintJobManager::RegisterPrefs(local_state); 153 printing::PrintJobManager::RegisterPrefs(local_state);
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 } 286 }
284 local_state->ClearPref(prefs::kBrowserWindowPlacement); 287 local_state->ClearPref(prefs::kBrowserWindowPlacement);
285 288
286 current_version |= WINDOWS_PREFS; 289 current_version |= WINDOWS_PREFS;
287 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 290 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
288 current_version); 291 current_version);
289 } 292 }
290 } 293 }
291 294
292 } // namespace browser 295 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_network_delegate.cc ('k') | chrome/browser/renderer_host/chrome_render_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698