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

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.h

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Perhaps HostZoomLevelContextDeleter was needed after all ... Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 5 #ifndef CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 6 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition( 96 net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition(
97 const base::FilePath& partition_path, 97 const base::FilePath& partition_path,
98 bool in_memory) override; 98 bool in_memory) override;
99 content::ResourceContext* GetResourceContext() override; 99 content::ResourceContext* GetResourceContext() override;
100 content::BrowserPluginGuestManager* GetGuestManager() override; 100 content::BrowserPluginGuestManager* GetGuestManager() override;
101 storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override; 101 storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
102 content::PushMessagingService* GetPushMessagingService() override; 102 content::PushMessagingService* GetPushMessagingService() override;
103 content::SSLHostStateDelegate* GetSSLHostStateDelegate() override; 103 content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
104 104
105 private: 105 private:
106 FRIEND_TEST_ALL_PREFIXES(OffTheRecordProfileImplTest, GetHostZoomMap);
107 void InitIoData(); 106 void InitIoData();
108 void InitHostZoomMap(); 107 // Allows a profile to track changes in zoom levels in its parent profile.
108 void TrackZoomLevelsFromParent();
109 109
110 #if defined(OS_ANDROID) || defined(OS_IOS) 110 #if defined(OS_ANDROID) || defined(OS_IOS)
111 void UseSystemProxy(); 111 void UseSystemProxy();
112 #endif // defined(OS_ANDROID) || defined(OS_IOS) 112 #endif // defined(OS_ANDROID) || defined(OS_IOS)
113 113
114 void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change);
115 PrefProxyConfigTracker* CreateProxyConfigTracker(); 114 PrefProxyConfigTracker* CreateProxyConfigTracker();
115 // Callback function for tracking parent's zoom level changes.
116 void TrackParentZoomLevelChanged(
Charlie Reis 2014/11/04 23:43:16 The original OnZoomLevelChanged name sounds better
wjmaclean 2014/11/05 21:55:42 Done. I chose OnParentZoomLevelChanged ... I want
117 const content::HostZoomMap::ZoomLevelChange& change);
116 118
117 // The real underlying profile. 119 // The real underlying profile.
118 Profile* profile_; 120 Profile* profile_;
119 121
120 // Weak pointer owned by |profile_|. 122 // Weak pointer owned by |profile_|.
121 PrefServiceSyncable* prefs_; 123 PrefServiceSyncable* prefs_;
122 124
125 scoped_ptr<content::HostZoomMap::Subscription> track_zoom_subscription_;
123 scoped_ptr<OffTheRecordProfileIOData::Handle> io_data_; 126 scoped_ptr<OffTheRecordProfileIOData::Handle> io_data_;
124 127
125 // We use a non-persistent content settings map for OTR. 128 // We use a non-persistent content settings map for OTR.
126 scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 129 scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
127 130
128 // Time we were started. 131 // Time we were started.
129 Time start_time_; 132 Time start_time_;
130 133
131 base::FilePath last_selected_directory_; 134 base::FilePath last_selected_directory_;
132 135
133 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 136 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
134 137
135 scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
136
137 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 138 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
138 }; 139 };
139 140
140 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_ 141 #endif // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698