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

Unified Diff: chrome/browser/ui/zoom/zoom_controller.cc

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments; patch for landing. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/zoom/zoom_controller.h ('k') | chrome/browser/ui/zoom/zoom_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/zoom/zoom_controller.cc
diff --git a/chrome/browser/ui/zoom/zoom_controller.cc b/chrome/browser/ui/zoom/zoom_controller.cc
index a9b7029b504757338426ba8bbf0df9479661c730..1918ce53e484e81b0eb3aca7b1fe4694d6ba273c 100644
--- a/chrome/browser/ui/zoom/zoom_controller.cc
+++ b/chrome/browser/ui/zoom/zoom_controller.cc
@@ -27,10 +27,8 @@ ZoomController::ZoomController(content::WebContents* web_contents)
zoom_mode_(ZOOM_MODE_DEFAULT),
zoom_level_(1.0),
browser_context_(web_contents->GetBrowserContext()) {
- // TODO(wjmaclean) Make calls to HostZoomMap::GetDefaultForBrowserContext()
- // refer to the webcontents-specific HostZoomMap when that becomes available.
content::HostZoomMap* host_zoom_map =
- content::HostZoomMap::GetDefaultForBrowserContext(browser_context_);
+ content::HostZoomMap::GetForWebContents(web_contents);
zoom_level_ = host_zoom_map->GetDefaultZoomLevel();
zoom_subscription_ = host_zoom_map->AddZoomLevelChangedCallback(
@@ -118,7 +116,7 @@ bool ZoomController::SetZoomLevelByExtension(
}
content::HostZoomMap* zoom_map =
- content::HostZoomMap::GetDefaultForBrowserContext(browser_context_);
+ content::HostZoomMap::GetForWebContents(web_contents());
DCHECK(zoom_map);
DCHECK(!event_data_);
event_data_.reset(new ZoomChangedEventData(web_contents(),
@@ -152,7 +150,7 @@ void ZoomController::SetZoomMode(ZoomMode new_mode) {
return;
content::HostZoomMap* zoom_map =
- content::HostZoomMap::GetDefaultForBrowserContext(browser_context_);
+ content::HostZoomMap::GetForWebContents(web_contents());
DCHECK(zoom_map);
int render_process_id = web_contents()->GetRenderProcessHost()->GetID();
int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
« no previous file with comments | « chrome/browser/ui/zoom/zoom_controller.h ('k') | chrome/browser/ui/zoom/zoom_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698