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

[zoom bubble] Fix my stupidity and restore the proper host handling logic to ZoomController::UpdateState().

BUG=161388
R=estade@chromium.org

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=168158

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

https://chromiumcodereview.appspot.com/11299014/diff/4001/chrome/browser/ui/z...
File chrome/browser/ui/zoom/zoom_controller.cc (right):

https://chromiumcodereview.appspot.com/11299014/diff/4001/chrome/browser/ui/z...
chrome/browser/ui/zoom/zoom_controller.cc:38: UpdateState(std::string());
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]

https://chromiumcodereview.appspot.com/11299014/diff/4001/chrome/browser/ui/z...
File chrome/browser/ui/zoom/zoom_controller.cc (right):

https://chromiumcodereview.appspot.com/11299014/diff/4001/chrome/browser/ui/z...
chrome/browser/ui/zoom/zoom_controller.cc:38: UpdateState(std::string());
On 2012/11/15 23:05:06, Dan Beam wrote:
> 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?

nevermind, it also sets |zoom_percent_|.

[Dan Beam, 2012-11-15 23:19:17]

this is just the minimal, mergeable fix now

[Evan Stade, 2012-11-15 23:21:03]

lgtm

[commit-bot: I haz the power, 2012-11-16 00:02:37]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dbeam@chromium.org/11299014/7001

[commit-bot: I haz the power, 2012-11-16 00:02:39]

Presubmit check for 11299014-7001 failed and returned exit status 1.


Running presubmit commit checks ...

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    chrome/browser/ui

[commit-bot: I haz the power, 2012-11-16 01:55:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dbeam@chromium.org/11299014/7001

[commit-bot: I haz the power, 2012-11-16 01:55:06]

Failed to apply patch for chrome/browser/ui/zoom/zoom_controller.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/zoom/zoom_controller.cc
  Hunk #1 FAILED at 76.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/ui/zoom/zoom_controller.cc.rej

Patch:       chrome/browser/ui/zoom/zoom_controller.cc
Index: chrome/browser/ui/zoom/zoom_controller.cc
diff --git a/chrome/browser/ui/zoom/zoom_controller.cc
b/chrome/browser/ui/zoom/zoom_controller.cc
index
6b0de350b29e627cbc81545a3cd5e2cd61ecdbe6..def7fab52ab6df66ed6d4d32447cc301f99b2ae4
100644
--- a/chrome/browser/ui/zoom/zoom_controller.cc
+++ b/chrome/browser/ui/zoom/zoom_controller.cc
@@ -76,16 +76,16 @@ void ZoomController::OnPreferenceChanged(PrefServiceBase*
service,
 }
 
 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;

[commit-bot: I haz the power, 2012-11-16 02:29:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dbeam@chromium.org/11299014/4002

[commit-bot: I haz the power, 2012-11-16 07:45:24]

Change committed as 168158