[zoom bubble] Fix my stupidity and restore the proper host handling

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"
@@ skipping 17 matching lines @@
       observer_(NULL) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   default_zoom_level_.Init(prefs::kDefaultZoomLevel, profile->GetPrefs(), this);
 
   content::HostZoomMap* zoom_map =
       content::HostZoomMap::GetForBrowserContext(profile);
   registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
                  content::Source<content::HostZoomMap>(zoom_map));
 
   UpdateState(std::string());

[Dan Beam, 2012/11/15 23:05:06]

FYI: I don't see the point to this first UpdateState() call if the point is to
notify an observer and you're guaranteed that |observer_| is NULL here (as it
can't be set yet). Should I remove?

[Dan Beam, 2012/11/15 23:18:33]

nevermind, it also sets |zoom_percent_|.

 }
 
 ZoomController::~ZoomController() {
   default_zoom_level_.Destroy();
   registrar_.RemoveAll();
 }
 
 bool ZoomController::IsAtDefaultZoom() const {
   return content::ZoomValuesEqual(web_contents()->GetZoomLevel(),
                                   default_zoom_level_.GetValue());
@@ skipping 20 matching lines @@
   UpdateState(*content::Details<std::string>(details).ptr());
 }
 
 void ZoomController::OnPreferenceChanged(PrefServiceBase* service,
                                          const std::string& pref_name) {
   DCHECK(pref_name == prefs::kDefaultZoomLevel);
   UpdateState(std::string());
 }
 
 void ZoomController::UpdateState(const std::string& host) {
-  if (host.empty())
-    return;
-
-  // 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;
+  // 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());
 }