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

Unified Diff: chrome/browser/instant/instant_loader.cc

Issue 10809063: Adding Javascript support for the Extended Searchbox API. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Adding missing file from last upload. Created 8 years, 4 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/instant/instant_loader.cc
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index 1f088885ff6f6e188e9f563851934cb0fb8c2210..e4098afe252f59e34687c37010fb2cd677a527a4 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -74,8 +74,7 @@ class InstantLoader::WebContentsDelegateImpl
private:
// Message from renderer indicating the page has suggestions.
void OnSetSuggestions(int page_id,
- const std::vector<string16>& suggestions,
- InstantCompleteBehavior behavior);
+ const std::vector<InstantSuggestion>& suggestions);
// Message from the renderer determining whether it supports the Instant API.
void OnInstantSupportDetermined(int page_id, bool result);
@@ -198,13 +197,12 @@ bool InstantLoader::WebContentsDelegateImpl::OnMessageReceived(
void InstantLoader::WebContentsDelegateImpl::OnSetSuggestions(
int page_id,
- const std::vector<string16>& suggestions,
- InstantCompleteBehavior behavior) {
+ const std::vector<InstantSuggestion>& suggestions) {
content::NavigationEntry* entry = loader_->preview_contents_->web_contents()->
GetController().GetActiveEntry();
if (entry && page_id == entry->GetPageID()) {
MaybeSetAndNotifyInstantSupportDetermined(true);
- loader_->loader_delegate_->SetSuggestions(loader_, suggestions, behavior);
+ loader_->loader_delegate_->SetSuggestions(loader_, suggestions);
}
}

Powered by Google App Engine
This is Rietveld 408576698