Wrap more Pepper/PDF code with ENABLE_{PDF,PLUGINS} buildflags.
- Consolidate Pepper code within a BUILDFLAG(ENABLE_PLUGINS) section
in browser_prefs.cc.
- Make AddStringsForPdf() a no-op if BUILDFLAG(ENABLE_PDF) is not set in
resources_private_api.cc.
Bug: 1027360
Change-Id: Ie99dcc278d3b30282f4215e36ac95a6434fa0ebf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017663
Reviewed-by: Daniel Hosseinian <[email protected]>
Commit-Queue: Lei Zhang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#734664}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 1258828f..f27eb3e 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -44,7 +44,6 @@
#include "chrome/browser/notifications/notification_channels_provider_android.h"
#include "chrome/browser/notifications/notifier_state_tracker.h"
#include "chrome/browser/notifications/platform_notification_service_impl.h"
-#include "chrome/browser/pepper_flash_settings_manager.h"
#include "chrome/browser/permissions/quiet_notification_permission_ui_state.h"
#include "chrome/browser/policy/developer_tools_policy_handler.h"
#include "chrome/browser/policy/webusb_allow_devices_for_urls_policy_handler.h"
@@ -62,7 +61,6 @@
#include "chrome/browser/profiles/profile_info_cache.h"
#include "chrome/browser/profiles/profiles_state.h"
#include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
-#include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
#include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h"
#include "chrome/browser/search/search.h"
#include "chrome/browser/sharing/sharing_sync_preference.h"
@@ -187,8 +185,10 @@
#endif
#if BUILDFLAG(ENABLE_PLUGINS)
+#include "chrome/browser/pepper_flash_settings_manager.h"
#include "chrome/browser/plugins/plugin_info_host_impl.h"
#include "chrome/browser/plugins/plugins_resource_service.h"
+#include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
#endif
#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
@@ -882,6 +882,8 @@
#endif
#if BUILDFLAG(ENABLE_PLUGINS)
+ DeviceIDFetcher::RegisterProfilePrefs(registry);
+ PepperFlashSettingsManager::RegisterProfilePrefs(registry);
PluginInfoHostImpl::RegisterUserPrefs(registry);
#endif
@@ -927,7 +929,6 @@
AppShortcutManager::RegisterProfilePrefs(registry);
browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
ChromeAuthenticatorRequestDelegate::RegisterProfilePrefs(registry);
- DeviceIDFetcher::RegisterProfilePrefs(registry);
DevToolsWindow::RegisterProfilePrefs(registry);
enterprise_reporting::RegisterProfilePrefs(registry);
extensions::CommandService::RegisterProfilePrefs(registry);
@@ -941,7 +942,6 @@
media_router::RegisterProfilePrefs(registry);
NewTabUI::RegisterProfilePrefs(registry);
ntp_tiles::CustomLinksManagerImpl::RegisterProfilePrefs(registry);
- PepperFlashSettingsManager::RegisterProfilePrefs(registry);
PinnedTabCodec::RegisterProfilePrefs(registry);
PromoService::RegisterProfilePrefs(registry);
SearchSuggestService::RegisterProfilePrefs(registry);
