Chromium Code Reviews| 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 53e0621e2864432bf8407dc3eabb60a203b0539c..25fa2ec29bd2e7ea566121e8aeaa31d37feb29cb 100644 |
| --- a/chrome/browser/profiles/off_the_record_profile_impl.h |
| +++ b/chrome/browser/profiles/off_the_record_profile_impl.h |
| @@ -84,6 +84,8 @@ class OffTheRecordProfileImpl : public Profile { |
| // content::BrowserContext implementation: |
| base::FilePath GetPath() const override; |
| + scoped_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate( |
| + const base::FilePath& partition_path) override; |
| scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() override; |
| bool IsOffTheRecord() const override; |
| content::DownloadManagerDelegate* GetDownloadManagerDelegate() override; |
| @@ -103,16 +105,18 @@ class OffTheRecordProfileImpl : public Profile { |
| content::SSLHostStateDelegate* GetSSLHostStateDelegate() override; |
| private: |
| - FRIEND_TEST_ALL_PREFIXES(OffTheRecordProfileImplTest, GetHostZoomMap); |
| void InitIoData(); |
| - void InitHostZoomMap(); |
| + // Allows a profile to track changes in zoom levels in its parent profile. |
|
Bernhard Bauer
2014/11/12 10:39:20
Nit: Blank lines before comments?
wjmaclean
2014/11/12 15:12:55
Done.
|
| + void TrackZoomLevelsFromParent(); |
| #if defined(OS_ANDROID) || defined(OS_IOS) |
| void UseSystemProxy(); |
| #endif // defined(OS_ANDROID) || defined(OS_IOS) |
| - void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change); |
| PrefProxyConfigTracker* CreateProxyConfigTracker(); |
| + // Callback function for tracking parent's zoom level changes. |
| + void OnParentZoomLevelChanged( |
| + const content::HostZoomMap::ZoomLevelChange& change); |
| // The real underlying profile. |
| Profile* profile_; |
| @@ -120,6 +124,7 @@ class OffTheRecordProfileImpl : public Profile { |
| // Weak pointer owned by |profile_|. |
| PrefServiceSyncable* prefs_; |
| + scoped_ptr<content::HostZoomMap::Subscription> track_zoom_subscription_; |
| scoped_ptr<OffTheRecordProfileIOData::Handle> io_data_; |
| // We use a non-persistent content settings map for OTR. |
| @@ -132,8 +137,6 @@ class OffTheRecordProfileImpl : public Profile { |
| scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; |
| - scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_; |
| - |
| DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); |
| }; |