Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5987)

Unified Diff: chrome/browser/ui/zoom/zoom_controller.cc

Issue 11299014: [zoom bubble] Fix my stupidity and restore the proper host handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/zoom/zoom_controller.h ('k') | chrome/browser/ui/zoom/zoom_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « chrome/browser/ui/zoom/zoom_controller.h ('k') | chrome/browser/ui/zoom/zoom_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698