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

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

Issue 2458833005: Move printing defines to buildflag system. (Closed)
Patch Set: Missing file Created 4 years, 1 month 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 <string> 7 #include <string>
8 8
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 #include "components/subresource_filter/core/browser/ruleset_service.h" 100 #include "components/subresource_filter/core/browser/ruleset_service.h"
101 #include "components/sync/base/sync_prefs.h" 101 #include "components/sync/base/sync_prefs.h"
102 #include "components/sync_preferences/pref_service_syncable.h" 102 #include "components/sync_preferences/pref_service_syncable.h"
103 #include "components/translate/core/browser/language_model.h" 103 #include "components/translate/core/browser/language_model.h"
104 #include "components/translate/core/browser/translate_prefs.h" 104 #include "components/translate/core/browser/translate_prefs.h"
105 #include "components/update_client/update_client.h" 105 #include "components/update_client/update_client.h"
106 #include "components/variations/service/variations_service.h" 106 #include "components/variations/service/variations_service.h"
107 #include "content/public/browser/browser_thread.h" 107 #include "content/public/browser/browser_thread.h"
108 #include "content/public/browser/render_process_host.h" 108 #include "content/public/browser/render_process_host.h"
109 #include "net/http/http_server_properties_manager.h" 109 #include "net/http/http_server_properties_manager.h"
110 #include "printing/features/features.h"
110 111
111 #if BUILDFLAG(ENABLE_APP_LIST) 112 #if BUILDFLAG(ENABLE_APP_LIST)
112 #include "chrome/browser/apps/drive/drive_app_mapping.h" 113 #include "chrome/browser/apps/drive/drive_app_mapping.h"
113 #endif 114 #endif
114 115
115 #if BUILDFLAG(ENABLE_BACKGROUND) 116 #if BUILDFLAG(ENABLE_BACKGROUND)
116 #include "chrome/browser/background/background_mode_manager.h" 117 #include "chrome/browser/background/background_mode_manager.h"
117 #endif 118 #endif
118 119
119 #if defined(ENABLE_EXTENSIONS) 120 #if defined(ENABLE_EXTENSIONS)
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 !defined(OS_ANDROID) 531 !defined(OS_ANDROID)
531 // The extension welcome notification requires a build that enables extensions 532 // The extension welcome notification requires a build that enables extensions
532 // and notifications, and uses the UI message center. 533 // and notifications, and uses the UI message center.
533 ExtensionWelcomeNotification::RegisterProfilePrefs(registry); 534 ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
534 #endif 535 #endif
535 536
536 #if defined(ENABLE_PLUGINS) 537 #if defined(ENABLE_PLUGINS)
537 PluginsUI::RegisterProfilePrefs(registry); 538 PluginsUI::RegisterProfilePrefs(registry);
538 #endif 539 #endif
539 540
540 #if defined(ENABLE_PRINT_PREVIEW) 541 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
541 printing::StickySettings::RegisterProfilePrefs(registry); 542 printing::StickySettings::RegisterProfilePrefs(registry);
542 #endif 543 #endif
543 544
544 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 545 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
545 LocalDiscoveryUI::RegisterProfilePrefs(registry); 546 LocalDiscoveryUI::RegisterProfilePrefs(registry);
546 #endif 547 #endif
547 548
548 #if defined(ENABLE_SUPERVISED_USERS) 549 #if defined(ENABLE_SUPERVISED_USERS)
549 #if !defined(OS_ANDROID) 550 #if !defined(OS_ANDROID)
550 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); 551 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry);
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 // Added 8/2016. 776 // Added 8/2016.
776 profile_prefs->ClearPref(kStaticEncodings); 777 profile_prefs->ClearPref(kStaticEncodings);
777 profile_prefs->ClearPref(kRecentlySelectedEncoding); 778 profile_prefs->ClearPref(kRecentlySelectedEncoding);
778 779
779 // Added 9/2016. 780 // Added 9/2016.
780 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 781 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
781 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 782 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
782 } 783 }
783 784
784 } // namespace chrome 785 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698