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

Unified Diff: chrome/browser/ui/toolbar/origin_chip_info.cc

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing files. Created 6 years, 7 months 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
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 ca702e76a2dbb8ef907a7af829439c43164a3dac..1b32a06327528e5a72e72a40ffbecb7643b198ce 100644
--- a/chrome/browser/ui/toolbar/origin_chip_info.cc
+++ b/chrome/browser/ui/toolbar/origin_chip_info.cc
@@ -197,7 +197,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.
@@ -230,14 +230,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;
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_impl.cc ('k') | chrome/browser/web_applications/web_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698