Allow zooming error pages.

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 "chrome/browser/ui/sad_tab.h"
 #include "chrome/browser/ui/zoom/zoom_event_manager.h"
 #include "chrome/browser/ui/zoom/zoom_observer.h"
 #include "content/public/browser/host_zoom_map.h"
@@ skipping 63 matching lines @@
 bool ZoomController::SetZoomLevel(double zoom_level) {
   // An extension did not initiate this zoom change.
   return SetZoomLevelByExtension(zoom_level, NULL);
 }
 
 bool ZoomController::SetZoomLevelByExtension(
     double zoom_level,
     const scoped_refptr<const extensions::Extension>& extension) {
   content::NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
-  bool is_normal_page =
-      entry && entry->GetPageType() == content::PAGE_TYPE_NORMAL;
   // Cannot zoom in disabled mode. Also, don't allow changing zoom level on
   // a crashed tab, an error page or an interstitial page.
   if (zoom_mode_ == ZOOM_MODE_DISABLED ||
-      !web_contents()->GetRenderViewHost()->IsRenderViewLive() ||
-      !is_normal_page)
+      !web_contents()->GetRenderViewHost()->IsRenderViewLive())
     return false;
 
   // Store extension data so that |extension| can be attributed when the zoom
   // change completes. We expect that by the time this function returns that
   // any observers that require this information will have requested it.
   last_extension_ = extension;
 
   // Do not actually rescale the page in manual mode.
   if (zoom_mode_ == ZOOM_MODE_MANUAL) {
     double old_zoom_level = zoom_level_;
@@ skipping 31 matching lines @@
   int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
   if (zoom_mode_ == ZOOM_MODE_ISOLATED ||
       zoom_map->UsesTemporaryZoomLevel(render_process_id, render_view_id)) {
     zoom_map->SetTemporaryZoomLevel(
         render_process_id, render_view_id, zoom_level);
   } else {
     if (!entry) {
       last_extension_ = NULL;
       return false;
     }
-    std::string host = net::GetHostOrSpecFromURL(entry->GetURL());
+    std::string host =
+        net::GetHostOrSpecFromURL(content::HostZoomMap::GetURLFromEntry(entry));
     zoom_map->SetZoomLevelForHost(host, zoom_level);
   }
 
   DCHECK(!event_data_);
   last_extension_ = NULL;
   return true;
 }
 
 void ZoomController::SetZoomMode(ZoomMode new_mode) {
   if (new_mode == zoom_mode_)
@@ skipping 12 matching lines @@
                                              original_zoom_level,
                                              new_mode,
                                              new_mode != ZOOM_MODE_DEFAULT));
 
   switch (new_mode) {
     case ZOOM_MODE_DEFAULT: {
       content::NavigationEntry* entry =
           web_contents()->GetController().GetLastCommittedEntry();
 
       if (entry) {
-        GURL url = entry->GetURL();
+        GURL url = content::HostZoomMap::GetURLFromEntry(entry);
         std::string host = net::GetHostOrSpecFromURL(url);
 
         if (zoom_map->HasZoomLevel(url.scheme(), host)) {
           // If there are other tabs with the same origin, then set this tab's
           // zoom level to match theirs. The temporary zoom level will be
           // cleared below, but this call will make sure this tab re-draws at
           // the correct zoom level.
           double origin_zoom_level =
               zoom_map->GetZoomLevelForHostAndScheme(url.scheme(), host);
           event_data_->new_zoom_level = origin_zoom_level;
@@ skipping 76 matching lines @@
 }
 
 void ZoomController::UpdateState(const std::string& host) {
   // If |host| is empty, all observers should be updated.
   if (!host.empty()) {
     // Use the navigation entry's URL instead of the WebContents' so virtual
     // URLs work (e.g. chrome://settings). http://crbug.com/153950
     content::NavigationEntry* entry =
         web_contents()->GetController().GetLastCommittedEntry();
     if (!entry ||
-        host != net::GetHostOrSpecFromURL(entry->GetURL())) {
+        host != net::GetHostOrSpecFromURL(
+                    content::HostZoomMap::GetURLFromEntry(entry))) {
       return;
     }
   }
 
   // The zoom bubble should not be shown for zoom changes where the host is
   // empty.
   bool can_show_bubble = can_show_bubble_ && !host.empty();
 
   if (event_data_) {
     // For state changes initiated within the ZoomController, information about
     // the change should be sent.
     ZoomChangedEventData zoom_change_data = *event_data_;
     event_data_.reset();
     zoom_change_data.can_show_bubble = can_show_bubble;
     FOR_EACH_OBSERVER(
         ZoomObserver, observers_, OnZoomChanged(zoom_change_data));
   } else {
     // TODO(wjmaclean) Should we consider having HostZoomMap send both old and
     // new zoom levels here?
     double zoom_level = GetZoomLevel();
     ZoomChangedEventData zoom_change_data(
         web_contents(), zoom_level, zoom_level, zoom_mode_, can_show_bubble);
     FOR_EACH_OBSERVER(
         ZoomObserver, observers_, OnZoomChanged(zoom_change_data));
   }
 }