Fix zoom icon/bubble for virtual URLs (i.e. chrome://settings).

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/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/host_zoom_map.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_zoom.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ZoomController)
 
@@ skipping 49 matching lines @@
     }
     case content::NOTIFICATION_ZOOM_LEVEL_CHANGED:
       UpdateState(*content::Details<std::string>(details).ptr());
       break;
     default:
       NOTREACHED();
   }
 }
 
 void ZoomController::UpdateState(const std::string& host) {
-  if (!host.empty() &&
-      host != net::GetHostOrSpecFromURL(web_contents()->GetURL())) {
+  if (host.empty())
     return;
+
+  content::NavigationEntry* active_entry =
+      web_contents()->GetController().GetActiveEntry();
+  if (active_entry) {
+    // Prefer to ask the navigation controller for the non-virtual URL.

[sky, 2012/10/04 16:01:12]

Document why we need to do this.

[Dan Beam, 2012/10/04 16:03:11]

Is the explanation a couple lines below sufficient (that virtual URLs break
this)?

[Dan Beam, 2012/10/04 19:05:42]

OK, so I added a comment in the newest version with a link to the bug.

+    if (host != net::GetHostOrSpecFromURL(active_entry->GetURL()))
+      return;
+  } else {

[Kyle Horimoto, 2012/10/04 03:00:22]

When exactly is active_entry NULL? A little confused here.

[Dan Beam, 2012/10/04 03:13:04]

http://code.google.com/searchframe#OAMlx_jo-ck/src/content/public/browser/nav...

+    // If that's not available, just ask the web contents (doesn't work on pages
+    // with virtual URLs, e.g. chrome://settings).
+    if (host != net::GetHostOrSpecFromURL(web_contents()->GetURL()))
+      return;
   }
 
   bool dummy;
   zoom_percent_ = web_contents()->GetZoomPercent(&dummy, &dummy);
 
   if (observer_)
     observer_->OnZoomChanged(web_contents(), !host.empty());
 }