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

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

Issue 10540033: Add ENABLE_PRINTING and disable it on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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/accessibility/invert_bubble_prefs.h" 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 browser::RegisterBrowserViewPrefs(local_state); 143 browser::RegisterBrowserViewPrefs(local_state);
144 browser::RegisterTabStripLayoutTypePrefs(local_state); 144 browser::RegisterTabStripLayoutTypePrefs(local_state);
145 #endif 145 #endif
146 146
147 #if !defined(OS_ANDROID) 147 #if !defined(OS_ANDROID)
148 BackgroundModeManager::RegisterPrefs(local_state); 148 BackgroundModeManager::RegisterPrefs(local_state);
149 Browser::RegisterPrefs(local_state); 149 Browser::RegisterPrefs(local_state);
150 FlagsUI::RegisterPrefs(local_state); 150 FlagsUI::RegisterPrefs(local_state);
151 ManagedMode::RegisterPrefs(local_state); 151 ManagedMode::RegisterPrefs(local_state);
152 NewTabPageHandler::RegisterPrefs(local_state); 152 NewTabPageHandler::RegisterPrefs(local_state);
153 printing::PrintJobManager::RegisterPrefs(local_state);
154 PromoResourceService::RegisterPrefs(local_state); 153 PromoResourceService::RegisterPrefs(local_state);
155 UpgradeDetector::RegisterPrefs(local_state); 154 UpgradeDetector::RegisterPrefs(local_state);
156 #endif 155 #endif
157 156
157 #if defined(ENABLE_PRINTING)
158 printing::PrintJobManager::RegisterPrefs(local_state);
159 #endif
160
158 #if defined(OS_CHROMEOS) 161 #if defined(OS_CHROMEOS)
159 chromeos::AudioHandler::RegisterPrefs(local_state); 162 chromeos::AudioHandler::RegisterPrefs(local_state);
160 chromeos::language_prefs::RegisterPrefs(local_state); 163 chromeos::language_prefs::RegisterPrefs(local_state);
161 chromeos::DataPromoNotification::RegisterPrefs(local_state); 164 chromeos::DataPromoNotification::RegisterPrefs(local_state);
162 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); 165 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state);
163 chromeos::UserManager::RegisterPrefs(local_state); 166 chromeos::UserManager::RegisterPrefs(local_state);
164 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); 167 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
165 chromeos::signed_settings_cache::RegisterPrefs(local_state); 168 chromeos::signed_settings_cache::RegisterPrefs(local_state);
166 chromeos::WizardController::RegisterPrefs(local_state); 169 chromeos::WizardController::RegisterPrefs(local_state);
167 policy::AutoEnrollmentClient::RegisterPrefs(local_state); 170 policy::AutoEnrollmentClient::RegisterPrefs(local_state);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 } 313 }
311 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 314 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
312 315
313 current_version |= GOOGLE_URL_TRACKER_PREFS; 316 current_version |= GOOGLE_URL_TRACKER_PREFS;
314 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 317 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
315 current_version); 318 current_version);
316 } 319 }
317 } 320 }
318 321
319 } // namespace browser 322 } // namespace browser
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698