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

Unified Diff: chrome/browser/ui/omnibox/omnibox_edit_model.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve a merge conflict. 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/omnibox/omnibox_edit_model.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
index 284d472d11a836801de6f1f628053b1e7881f38b..1d814160cbaabce6bdd44efca5a81b6a80ce6469 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -481,10 +481,10 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min,
// entire host, and the user hasn't edited the host or manually removed the
// scheme.
GURL perm_url(PermanentURL());
- if (perm_url.SchemeIs(content::kHttpScheme) &&
- url->SchemeIs(content::kHttpScheme) && perm_url.host() == url->host()) {
+ if (perm_url.SchemeIs(url::kHttpScheme) &&
+ url->SchemeIs(url::kHttpScheme) && perm_url.host() == url->host()) {
*write_url = true;
- base::string16 http = base::ASCIIToUTF16(content::kHttpScheme) +
+ base::string16 http = base::ASCIIToUTF16(url::kHttpScheme) +
base::ASCIIToUTF16(content::kStandardSchemeSeparator);
if (text->compare(0, http.length(), http) != 0)
*text = http + *text;
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/search_engines/search_engine_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698