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

Unified Diff: chrome/renderer/searchbox/searchbox_extension.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/renderer/searchbox/searchbox_extension.cc
diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc
index f6d78a07fef2822e1be4bd52acf823b45cb18297..d96eb2cc204e1bf1331431661e529a310fa43b2d 100644
--- a/chrome/renderer/searchbox/searchbox_extension.cc
+++ b/chrome/renderer/searchbox/searchbox_extension.cc
@@ -15,7 +15,6 @@
#include "chrome/common/ntp_logging_events.h"
#include "chrome/common/url_constants.h"
#include "chrome/renderer/searchbox/searchbox.h"
-#include "content/public/common/url_constants.h"
#include "content/public/renderer/render_view.h"
#include "extensions/common/extension.h"
#include "grit/renderer_resources.h"
@@ -28,6 +27,7 @@
#include "ui/base/window_open_disposition.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "url/gurl.h"
+#include "url/url_constants.h"
#include "v8/include/v8.h"
namespace {
@@ -1038,7 +1038,7 @@ void SearchBoxExtensionWrapper::NavigateContentWindow(
// Navigate the main frame.
if (destination_url.is_valid() &&
- !destination_url.SchemeIs(content::kJavaScriptScheme)) {
+ !destination_url.SchemeIs(url::kJavaScriptScheme)) {
WindowOpenDisposition disposition = CURRENT_TAB;
if (args[1]->IsNumber()) {
disposition = (WindowOpenDisposition) args[1]->Uint32Value();
« no previous file with comments | « chrome/renderer/extensions/chrome_extension_helper.cc ('k') | chrome/renderer/translate/translate_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698