| Index: chrome/browser/ui/toolbar/origin_chip_info.cc
|
| diff --git a/chrome/browser/ui/toolbar/origin_chip_info.cc b/chrome/browser/ui/toolbar/origin_chip_info.cc
|
| index 84572f9e5ab5f1bdeab5f4a58776a3cdb494b3c7..52878688bb07779a2ea873ceae0bc8590ce3103f 100644
|
| --- a/chrome/browser/ui/toolbar/origin_chip_info.cc
|
| +++ b/chrome/browser/ui/toolbar/origin_chip_info.cc
|
| @@ -192,7 +192,7 @@ base::string16 OriginChip::LabelFromURLForProfile(const GURL& provided_url,
|
| base::UTF8ToUTF16(extension->name()) : base::UTF8ToUTF16(url.host());
|
| }
|
|
|
| - if (url.SchemeIsHTTPOrHTTPS() || url.SchemeIs(content::kFtpScheme)) {
|
| + if (url.SchemeIsHTTPOrHTTPS() || url.SchemeIs(url::kFtpScheme)) {
|
| // See ToolbarModelImpl::GetText(). Does not pay attention to any user
|
| // edits, and uses GetURL/net::FormatUrl -- We don't really care about
|
| // length or the autocomplete parser.
|
| @@ -225,14 +225,14 @@ base::string16 OriginChip::LabelFromURLForProfile(const GURL& provided_url,
|
| // to see. In these cases, the site chip will display the first
|
| // part of the full URL.
|
| if (url.SchemeIs(chrome::kChromeNativeScheme) ||
|
| - url.SchemeIs(content::kBlobScheme) ||
|
| + url.SchemeIs(url::kBlobScheme) ||
|
| url.SchemeIs(content::kChromeDevToolsScheme) ||
|
| - url.SchemeIs(content::kDataScheme) ||
|
| - url.SchemeIs(content::kFileScheme) ||
|
| - url.SchemeIs(content::kFileSystemScheme) ||
|
| + url.SchemeIs(url::kDataScheme) ||
|
| + url.SchemeIs(url::kFileScheme) ||
|
| + url.SchemeIs(url::kFileSystemScheme) ||
|
| url.SchemeIs(content::kGuestScheme) ||
|
| - url.SchemeIs(content::kJavaScriptScheme) ||
|
| - url.SchemeIs(content::kMailToScheme) ||
|
| + url.SchemeIs(url::kJavaScriptScheme) ||
|
| + url.SchemeIs(url::kMailToScheme) ||
|
| url.SchemeIs(content::kMetadataScheme) ||
|
| url.SchemeIs(content::kSwappedOutScheme)) {
|
| std::string truncated_url;
|
|
|