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

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: Initial patches. Created 6 years, 8 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 7ded315498ccb62dfa6256bb8de52520df96f730..53847eb1a09a2b2da0f3ef3ad37ad329bfdaf6ad 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
@@ -63,6 +63,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/user_metrics.h"
#include "extensions/common/constants.h"
+#include "net/base/url_constants.h"
#include "ui/gfx/image/image.h"
#include "url/url_util.h"
@@ -477,11 +478,11 @@ 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(net::kHttpScheme) && url->SchemeIs(net::kHttpScheme) &&
+ perm_url.host() == url->host()) {
*write_url = true;
- base::string16 http = base::ASCIIToUTF16(content::kHttpScheme) +
- base::ASCIIToUTF16(content::kStandardSchemeSeparator);
+ base::string16 http = base::ASCIIToUTF16(net::kHttpScheme) +
+ base::ASCIIToUTF16(content::kStandardSchemeSeparator);
if (text->compare(0, http.length(), http) != 0)
*text = http + *text;
}

Powered by Google App Engine
This is Rietveld 408576698