Add scheme to HostZoomMap

chrome/browser/ui/zoom/zoom_controller.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 "chrome/browser/ui/zoom/zoom_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 50 matching lines @@
 }
 
 void ZoomController::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // If the main frame's content has changed, the new page may have a different
   // zoom level from the old one.
   UpdateState(std::string());
 }
 
-void ZoomController::OnZoomLevelChanged(const std::string& host) {
-  UpdateState(host);
+void ZoomController::OnZoomLevelChanged(
+    const content::HostZoomMap::ZoomLevelChange& change) {
+  if (change.mode != content::HostZoomMap::ZOOM_CHANGED_TEMPORARY_ZOOM)
+    UpdateState(change.host);
 }
 
 void ZoomController::UpdateState(const std::string& host) {
   // If |host| is empty, all observers should be updated.
   if (!host.empty()) {
     // Use the active navigation entry's URL instead of the WebContents' so
     // virtual URLs work (e.g. chrome://settings). http://crbug.com/153950
     content::NavigationEntry* active_entry =
         web_contents()->GetController().GetActiveEntry();
     if (!active_entry ||
         host != net::GetHostOrSpecFromURL(active_entry->GetURL())) {
       return;
     }
   }
 
   bool dummy;
   zoom_percent_ = web_contents()->GetZoomPercent(&dummy, &dummy);
 
   if (observer_)
     observer_->OnZoomChanged(web_contents(), !host.empty());
 }