Index: chrome/renderer/resources/extensions/searchbox_api.js |
diff --git a/chrome/renderer/resources/extensions/searchbox_api.js b/chrome/renderer/resources/extensions/searchbox_api.js |
index 75caa64983ed8b5420eb764715bf10747a18e8a3..7cc79bbfc5d325225589d26b8e4e45773e1eee46 100644 |
--- a/chrome/renderer/resources/extensions/searchbox_api.js |
+++ b/chrome/renderer/resources/extensions/searchbox_api.js |
@@ -94,7 +94,6 @@ if (!chrome.embeddedSearch) { |
native function GetAutocompleteResults(); |
native function GetDisplayInstantResults(); |
native function GetFontSize(); |
- native function GetSuggestionIframeURLPrefix(); |
native function IsKeyCaptureEnabled(); |
native function SetQuery(); |
native function SetQueryFromAutocompleteResult(); |
@@ -105,10 +104,10 @@ if (!chrome.embeddedSearch) { |
native function FocusOmnibox(); |
native function StartCapturingKeyStrokes(); |
native function StopCapturingKeyStrokes(); |
- native function SetSuggestionStyle(); |
native function NavigateSearchBox(); |
native function ShowBars(); |
native function HideBars(); |
+ native function GetSuggestionData(); |
function SafeWrapSuggestion(restrictedText) { |
return SafeWrap(restrictedText, 22); |
@@ -136,7 +135,7 @@ if (!chrome.embeddedSearch) { |
result.combinedNode = SafeWrapSuggestion(combinedElement); |
delete result.contents; |
delete result.description; |
- result.destination_url = GetSuggestionIframeURLPrefix() + result.rid; |
+ delete result.destination_url; |
} |
return autocompleteResults; |
} |
@@ -230,6 +229,10 @@ if (!chrome.embeddedSearch) { |
this.__defineGetter__('font', GetFont); |
this.__defineGetter__('fontSize', GetFontSize); |
+ // This method is restricted to chrome-search://suggestion pages. |
+ this.getSuggestionData = function(restrictedId) { |
+ return GetSuggestionData(restrictedId); |
+ }; |
this.setSuggestions = function(text) { |
SetSuggestions(text); |
}; |
@@ -261,9 +264,6 @@ if (!chrome.embeddedSearch) { |
this.stopCapturingKeyStrokes = function() { |
StopCapturingKeyStrokes(); |
}; |
- this.setSuggestionStyle = function(url_color, title_color) { |
- SetSuggestionStyle(url_color, title_color); |
- }; |
this.navigateContentWindow = function(destination, disposition) { |
NavigateSearchBox(destination, disposition); |
} |