| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index ad4614665b2c777189f705f9e73804beced0f30b..d0d10447a3d2547f8b502c5144493e26cb24ff87 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -110,7 +110,6 @@
|
| #include "components/sync_preferences/pref_service_syncable.h"
|
| #include "components/url_formatter/url_fixer.h"
|
| #include "components/user_prefs/user_prefs.h"
|
| -#include "components/zoom/zoom_event_manager.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/dom_storage_context.h"
|
| #include "content/public/browser/notification_service.h"
|
| @@ -118,7 +117,6 @@
|
| #include "content/public/browser/storage_partition.h"
|
| #include "content/public/browser/url_data_source.h"
|
| #include "content/public/common/content_constants.h"
|
| -#include "content/public/common/page_zoom.h"
|
| #include "extensions/features/features.h"
|
| #include "mojo/public/cpp/bindings/strong_binding.h"
|
| #include "ppapi/features/features.h"
|
| @@ -144,6 +142,11 @@
|
| #include "components/user_manager/user_manager.h"
|
| #endif
|
|
|
| +#if !defined(OS_ANDROID)
|
| +#include "components/zoom/zoom_event_manager.h"
|
| +#include "content/public/common/page_zoom.h"
|
| +#endif
|
| +
|
| #if BUILDFLAG(ENABLE_BACKGROUND)
|
| #include "chrome/browser/background/background_mode_manager.h"
|
| #endif
|
| @@ -789,12 +792,14 @@ Profile::ProfileType ProfileImpl::GetProfileType() const {
|
| return REGULAR_PROFILE;
|
| }
|
|
|
| +#if !defined(OS_ANDROID)
|
| std::unique_ptr<content::ZoomLevelDelegate>
|
| ProfileImpl::CreateZoomLevelDelegate(const base::FilePath& partition_path) {
|
| return base::MakeUnique<ChromeZoomLevelPrefs>(
|
| GetPrefs(), GetPath(), partition_path,
|
| zoom::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr());
|
| }
|
| +#endif // !defined(OS_ANDROID)
|
|
|
| base::FilePath ProfileImpl::GetPath() const {
|
| return path_;
|
| @@ -980,10 +985,12 @@ const PrefService* ProfileImpl::GetPrefs() const {
|
| return prefs_.get();
|
| }
|
|
|
| +#if !defined(OS_ANDROID)
|
| ChromeZoomLevelPrefs* ProfileImpl::GetZoomLevelPrefs() {
|
| return static_cast<ChromeZoomLevelPrefs*>(
|
| GetDefaultStoragePartition(this)->GetZoomLevelDelegate());
|
| }
|
| +#endif // !defined(OS_ANDROID)
|
|
|
| PrefService* ProfileImpl::GetOffTheRecordPrefs() {
|
| DCHECK(prefs_);
|
|
|