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

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to r288093. Created 6 years, 4 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/off_the_record_profile_impl.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index 1d05bc215644404739839f13569748e18729740a..5403f97b54d3de447d564036242f347eaf8c6d13 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -78,7 +78,6 @@
using content::BrowserThread;
using content::DownloadManagerDelegate;
-using content::HostZoomMap;
#if defined(ENABLE_EXTENSIONS)
namespace {
@@ -139,7 +138,7 @@ void OffTheRecordProfileImpl::Init() {
GetRequestContext();
#endif // defined(OS_CHROMEOS)
- InitHostZoomMap();
+ TrackZoomLevelsFromParent(profile_);
#if defined(ENABLE_PLUGINS)
ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
@@ -191,18 +190,6 @@ void OffTheRecordProfileImpl::InitIoData() {
io_data_.reset(new OffTheRecordProfileIOData::Handle(this));
}
-void OffTheRecordProfileImpl::InitHostZoomMap() {
- HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
- HostZoomMap* parent_host_zoom_map =
- HostZoomMap::GetForBrowserContext(profile_);
- host_zoom_map->CopyFrom(parent_host_zoom_map);
- // Observe parent's HZM change for propagating change of parent's
- // change to this HZM.
- zoom_subscription_ = parent_host_zoom_map->AddZoomLevelChangedCallback(
- base::Bind(&OffTheRecordProfileImpl::OnZoomLevelChanged,
- base::Unretained(this)));
-}
-
#if defined(OS_ANDROID) || defined(OS_IOS)
void OffTheRecordProfileImpl::UseSystemProxy() {
// Force the use of the system-assigned proxy when off the record.
@@ -228,6 +215,10 @@ Profile::ProfileType OffTheRecordProfileImpl::GetProfileType() const {
return INCOGNITO_PROFILE;
}
+double OffTheRecordProfileImpl::GetDefaultZoomLevel() const {
+ return profile_->GetDefaultZoomLevel();
+}
+
base::FilePath OffTheRecordProfileImpl::GetPath() const {
return profile_->GetPath();
}
@@ -511,23 +502,6 @@ Profile* Profile::CreateOffTheRecordProfile() {
return profile;
}
-void OffTheRecordProfileImpl::OnZoomLevelChanged(
- const HostZoomMap::ZoomLevelChange& change) {
- HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
- switch (change.mode) {
- case HostZoomMap::ZOOM_CHANGED_TEMPORARY_ZOOM:
- return;
- case HostZoomMap::ZOOM_CHANGED_FOR_HOST:
- host_zoom_map->SetZoomLevelForHost(change.host, change.zoom_level);
- return;
- case HostZoomMap::ZOOM_CHANGED_FOR_SCHEME_AND_HOST:
- host_zoom_map->SetZoomLevelForHostAndScheme(change.scheme,
- change.host,
- change.zoom_level);
- return;
- }
-}
-
PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
#if defined(OS_CHROMEOS)
if (chromeos::ProfileHelper::IsSigninProfile(this)) {

Powered by Google App Engine
This is Rietveld 408576698