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

Side by Side 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: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/searchbox/searchbox_extension.h" 5 #include "chrome/renderer/searchbox/searchbox_extension.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/json/string_escape.h" 8 #include "base/json/string_escape.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 // Resolve the URL 1031 // Resolve the URL
1032 const base::string16& possibly_relative_url = V8ValueToUTF16(args[0]); 1032 const base::string16& possibly_relative_url = V8ValueToUTF16(args[0]);
1033 GURL current_url = GetCurrentURL(render_view); 1033 GURL current_url = GetCurrentURL(render_view);
1034 destination_url = internal::ResolveURL(current_url, possibly_relative_url); 1034 destination_url = internal::ResolveURL(current_url, possibly_relative_url);
1035 } 1035 }
1036 1036
1037 DVLOG(1) << render_view << " NavigateContentWindow: " << destination_url; 1037 DVLOG(1) << render_view << " NavigateContentWindow: " << destination_url;
1038 1038
1039 // Navigate the main frame. 1039 // Navigate the main frame.
1040 if (destination_url.is_valid() && 1040 if (destination_url.is_valid() &&
1041 !destination_url.SchemeIs(content::kJavaScriptScheme)) { 1041 !destination_url.SchemeIs(url::kJavaScriptScheme)) {
1042 WindowOpenDisposition disposition = CURRENT_TAB; 1042 WindowOpenDisposition disposition = CURRENT_TAB;
1043 if (args[1]->IsNumber()) { 1043 if (args[1]->IsNumber()) {
1044 disposition = (WindowOpenDisposition) args[1]->Uint32Value(); 1044 disposition = (WindowOpenDisposition) args[1]->Uint32Value();
1045 } 1045 }
1046 SearchBox::Get(render_view)->NavigateToURL(destination_url, disposition, 1046 SearchBox::Get(render_view)->NavigateToURL(destination_url, disposition,
1047 is_most_visited_item_url); 1047 is_most_visited_item_url);
1048 } 1048 }
1049 } 1049 }
1050 1050
1051 // static 1051 // static
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 if (!render_view) return; 1119 if (!render_view) return;
1120 1120
1121 bool display_instant_results = 1121 bool display_instant_results =
1122 SearchBox::Get(render_view)->display_instant_results(); 1122 SearchBox::Get(render_view)->display_instant_results();
1123 DVLOG(1) << render_view << " GetDisplayInstantResults" << 1123 DVLOG(1) << render_view << " GetDisplayInstantResults" <<
1124 display_instant_results; 1124 display_instant_results;
1125 args.GetReturnValue().Set(display_instant_results); 1125 args.GetReturnValue().Set(display_instant_results);
1126 } 1126 }
1127 1127
1128 } // namespace extensions_v8 1128 } // namespace extensions_v8
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698