Changes to content/ to facilitate new zoom extension API

content/browser/renderer_host/render_view_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 1723 matching lines @@
       view_->CreateBrowserAccessibilityManagerIfNeeded();
       BrowserAccessibilityManager* manager =
           view_->GetBrowserAccessibilityManager();
       if (manager)
         manager->OnLocationChanges(params);
     }
     // TODO(aboxhall): send location change events to web contents observers too
   }
 }
 
-void RenderViewHostImpl::OnDidZoomURL(double zoom_level,
+void RenderViewHostImpl::OnDidZoomURL(int zoom_id,
+                                      double zoom_level,
                                       bool remember,
                                       const GURL& url) {
   HostZoomMapImpl* host_zoom_map = static_cast<HostZoomMapImpl*>(
       HostZoomMap::GetForBrowserContext(GetProcess()->GetBrowserContext()));
   if (remember) {
     host_zoom_map->
-        SetZoomLevelForHost(net::GetHostOrSpecFromURL(url), zoom_level);
+        SetZoomLevelForHost(net::GetHostOrSpecFromURL(url), zoom_id,
+                            zoom_level);
   } else {
     host_zoom_map->SetTemporaryZoomLevel(
-        GetProcess()->GetID(), GetRoutingID(), zoom_level);
+        GetProcess()->GetID(), GetRoutingID(), net::GetHostOrSpecFromURL(url),
+        zoom_id, zoom_level);
   }
 }
 
 void RenderViewHostImpl::OnRequestDesktopNotificationPermission(
     const GURL& source_origin, int callback_context) {
   GetContentClient()->browser()->RequestDesktopNotificationPermission(
       source_origin, callback_context, GetProcess()->GetID(), GetRoutingID());
 }
 
 void RenderViewHostImpl::OnShowDesktopNotification(
@@ skipping 84 matching lines @@
   return true;
 }
 
 void RenderViewHostImpl::AttachToFrameTree() {
   FrameTree* frame_tree = delegate_->GetFrameTree();
 
   frame_tree->ResetForMainFrameSwap();
 }
 
 }  // namespace content