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

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

Issue 2458833005: Move printing defines to buildflag system. (Closed)
Patch Set: Merge 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 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 !defined(OS_ANDROID) 530 !defined(OS_ANDROID)
530 // The extension welcome notification requires a build that enables extensions 531 // The extension welcome notification requires a build that enables extensions
531 // and notifications, and uses the UI message center. 532 // and notifications, and uses the UI message center.
532 ExtensionWelcomeNotification::RegisterProfilePrefs(registry); 533 ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
533 #endif 534 #endif
534 535
535 #if defined(ENABLE_PLUGINS) 536 #if defined(ENABLE_PLUGINS)
536 PluginsUI::RegisterProfilePrefs(registry); 537 PluginsUI::RegisterProfilePrefs(registry);
537 #endif 538 #endif
538 539
539 #if defined(ENABLE_PRINT_PREVIEW) 540 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
540 printing::StickySettings::RegisterProfilePrefs(registry); 541 printing::StickySettings::RegisterProfilePrefs(registry);
541 #endif 542 #endif
542 543
543 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 544 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
544 LocalDiscoveryUI::RegisterProfilePrefs(registry); 545 LocalDiscoveryUI::RegisterProfilePrefs(registry);
545 #endif 546 #endif
546 547
547 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) 548 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
548 #if !defined(OS_ANDROID) 549 #if !defined(OS_ANDROID)
549 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry); 550 SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry);
(...skipping 225 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
« no previous file with comments | « chrome/browser/metrics/chrome_metrics_service_client.cc ('k') | chrome/browser/printing/cloud_print/privet_http_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698