Remove some chrome-specific methods from content::WebUI.

chrome/browser/ui/toolbar/toolbar_model_impl.cc

 // Copyright 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/toolbar/toolbar_model_impl.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
@@ skipping 130 matching lines @@
 }
 
 bool ToolbarModelImpl::WouldReplaceSearchURLWithSearchTerms() const {
   return !GetSearchTerms().empty();
 }
 
 bool ToolbarModelImpl::ShouldDisplayURL() const {
   // Note: The order here is important.
   // - The WebUI test must come before the extension scheme test because there
   //   can be WebUIs that have extension schemes (e.g. the bookmark manager). In
   //   that case, we should prefer what the WebUI instance says.

[Avi (use Gerrit), 2013/04/11 17:01:37]

Oh, that's much clearer. Thanks.

-  // - The view-source test must come before the WebUI test because of the case
+  // - The view-source test must come before the NTP test because of the case
   //   of view-source:chrome://newtab, which should display its URL despite what
-  //   chrome://newtab's WebUI says.
+  //   chrome://newtab says.
   NavigationController* controller = GetNavigationController();
   NavigationEntry* entry = controller ? controller->GetVisibleEntry() : NULL;
   if (entry) {
     if (entry->IsViewSourceMode() ||
         entry->GetPageType() == content::PAGE_TYPE_INTERSTITIAL) {
       return true;
     }
+
+    const GURL& url = entry->GetURL();
+    if (url.SchemeIs(chrome::kChromeUIScheme) &&
+        (url.host() == chrome::kChromeUINewTabHost ||
+        url.host() == chrome::kChromeUIExtensionActivityHost)) {
+      return false;
+    }
+
+    if (entry->GetVirtualURL().SchemeIs(chrome::kChromeUIScheme) &&
+        entry->GetVirtualURL().host() == chrome::kChromeUIBookmarksHost) {
+      return true;
+    }
+
+    if (url.SchemeIs(extensions::kExtensionScheme))
+      return false;
+
+#if defined(OS_CHROMEOS)
+    if (url.SchemeIs(chrome::kDriveScheme))
+      return false;
+#endif
   }
 
-  WebContents* web_contents = delegate_->GetActiveWebContents();
-  if (web_contents && web_contents->GetWebUIForCurrentState())
-    return !web_contents->GetWebUIForCurrentState()->ShouldHideURL();
-
-  if (entry && entry->GetURL().SchemeIs(extensions::kExtensionScheme))
-    return false;
-
-#if defined(OS_CHROMEOS)
-  if (entry && entry->GetURL().SchemeIs(chrome::kDriveScheme))
-    return false;
-#endif
-
-  if (chrome::IsInstantNTP(web_contents))
+  if (chrome::IsInstantNTP(delegate_->GetActiveWebContents()))
     return false;
 
   return true;
 }
 
 ToolbarModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel() const {
   if (input_in_progress_)  // When editing, assume no security style.
     return NONE;
 
   return GetSecurityLevelForWebContents(delegate_->GetActiveWebContents());
@@ skipping 74 matching lines @@
     Profile* profile =
         Profile::FromBrowserContext(contents->GetBrowserContext());
     AutocompleteClassifierFactory::GetForProfile(profile)->Classify(
         search_terms, false, false, &match, NULL);
     if (!AutocompleteMatch::IsSearchType(match.type))
       search_terms.clear();
   }
 
   return search_terms;
 }