| Index: chrome/browser/profiles/off_the_record_profile_impl.h
|
| diff --git a/chrome/browser/profiles/off_the_record_profile_impl.h b/chrome/browser/profiles/off_the_record_profile_impl.h
|
| index 75d8011bdf108d0e86d6e49e734d220a5e74bbda..77b93fd1abd9fe8bb89e28ddcb3fac835880b7a3 100644
|
| --- a/chrome/browser/profiles/off_the_record_profile_impl.h
|
| +++ b/chrome/browser/profiles/off_the_record_profile_impl.h
|
| @@ -13,10 +13,13 @@
|
| #include "chrome/browser/profiles/off_the_record_profile_io_data.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| -#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
|
| #include "components/domain_reliability/clear_mode.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| +
|
| +#if !defined(OS_ANDROID)
|
| +#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
|
| #include "content/public/browser/host_zoom_map.h"
|
| +#endif
|
|
|
| using base::Time;
|
| using base::TimeDelta;
|
| @@ -94,8 +97,10 @@ class OffTheRecordProfileImpl : public Profile {
|
|
|
| // content::BrowserContext implementation:
|
| base::FilePath GetPath() const override;
|
| +#if !defined(OS_ANDROID)
|
| std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(
|
| const base::FilePath& partition_path) override;
|
| +#endif // !defined(OS_ANDROID)
|
| scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() override;
|
| bool IsOffTheRecord() const override;
|
| content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
|
| @@ -110,18 +115,22 @@ class OffTheRecordProfileImpl : public Profile {
|
| private:
|
| void InitIoData();
|
|
|
| +#if !defined(OS_ANDROID)
|
| // Allows a profile to track changes in zoom levels in its parent profile.
|
| void TrackZoomLevelsFromParent();
|
| +#endif // !defined(OS_ANDROID)
|
|
|
| #if defined(OS_ANDROID)
|
| void UseSystemProxy();
|
| #endif // defined(OS_ANDROID)
|
|
|
| PrefProxyConfigTracker* CreateProxyConfigTracker();
|
| +#if !defined(OS_ANDROID)
|
| // Callback function for tracking parent's zoom level changes.
|
| void OnParentZoomLevelChanged(
|
| const content::HostZoomMap::ZoomLevelChange& change);
|
| void UpdateDefaultZoomLevel();
|
| +#endif // !defined(OS_ANDROID)
|
|
|
| // The real underlying profile.
|
| Profile* profile_;
|
| @@ -129,9 +138,11 @@ class OffTheRecordProfileImpl : public Profile {
|
| // Weak pointer owned by |profile_|.
|
| sync_preferences::PrefServiceSyncable* prefs_;
|
|
|
| +#if !defined(OS_ANDROID)
|
| std::unique_ptr<content::HostZoomMap::Subscription> track_zoom_subscription_;
|
| std::unique_ptr<ChromeZoomLevelPrefs::DefaultZoomLevelSubscription>
|
| parent_default_zoom_level_subscription_;
|
| +#endif // !defined(OS_ANDROID)
|
| std::unique_ptr<OffTheRecordProfileIOData::Handle> io_data_;
|
|
|
| // Time we were started.
|
|
|