diff options
Diffstat (limited to 'chrome/browser/ui/toolbar')
| -rw-r--r-- | chrome/browser/ui/toolbar/origin_chip.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/toolbar/toolbar_model_impl.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/toolbar/origin_chip.cc b/chrome/browser/ui/toolbar/origin_chip.cc index f070b73..e9caa30 100644 --- a/chrome/browser/ui/toolbar/origin_chip.cc +++ b/chrome/browser/ui/toolbar/origin_chip.cc @@ -28,7 +28,7 @@ namespace { // number for the title of the page. If we don't have a specialized title, // returns -1. int StringForChromeHost(const GURL& url) { - DCHECK(url.is_empty() || url.SchemeIs(chrome::kChromeUIScheme)); + DCHECK(url.is_empty() || url.SchemeIs(content::kChromeUIScheme)); if (url.is_empty()) return IDS_NEW_TAB_TITLE; @@ -99,7 +99,7 @@ base::string16 OriginChip::LabelFromURLForProfile(const GURL& provided_url, return base::UTF8ToUTF16(url.spec()); // Chrome built-in pages. - if (url.is_empty() || url.SchemeIs(chrome::kChromeUIScheme)) { + if (url.is_empty() || url.SchemeIs(content::kChromeUIScheme)) { int string_ref = StringForChromeHost(url); return (string_ref == -1) ? base::UTF8ToUTF16("Chrome") : diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc index 10dee3ef..f0de3dc 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc @@ -193,9 +193,9 @@ bool ToolbarModelImpl::ShouldDisplayURL() const { GURL url = entry->GetURL(); GURL virtual_url = entry->GetVirtualURL(); - if (url.SchemeIs(chrome::kChromeUIScheme) || - virtual_url.SchemeIs(chrome::kChromeUIScheme)) { - if (!url.SchemeIs(chrome::kChromeUIScheme)) + if (url.SchemeIs(content::kChromeUIScheme) || + virtual_url.SchemeIs(content::kChromeUIScheme)) { + if (!url.SchemeIs(content::kChromeUIScheme)) url = virtual_url; return url.host() != chrome::kChromeUINewTabHost; } |