Fix a bug in ShouldDisplayURL.

chrome/browser/ui/toolbar/toolbar_model.cc

Index: chrome/browser/ui/toolbar/toolbar_model.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc
index 9394410d511a76d1055adbc7cb6152c56060856e..6cd432b8149c51aebc7c1992d5fb2153748d8831 100644
--- a/chrome/browser/ui/toolbar/toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model.cc
@@ -77,8 +77,8 @@ bool ToolbarModel::ShouldDisplayURL() const {
   }
 
   TabContents* tab_contents = browser_->GetSelectedTabContents();
-  if (tab_contents && tab_contents->web_ui())

[brettw, 2011/10/12 17:43:59]

Can we add a comment above the web_ui() function in TabContents about which
WebUI it returns, and pointing callers to GetWebUIForCurrentState for most
things? Or should we even have web_ui() on TabContents?

[Charlie Reis, 2011/10/12 19:02:57]

I added a comment.  I don't know if we should be removing web_ui()-- that should
probably happen in a separate CL if so.

-    return !tab_contents->web_ui()->should_hide_url();
+  if (tab_contents && tab_contents->GetWebUIForCurrentState())
+    return !tab_contents->GetWebUIForCurrentState()->should_hide_url();
 
   if (entry && entry->url().SchemeIs(chrome::kExtensionScheme))
     return false;