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

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: Removing clear method. 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
« no previous file with comments | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/instant/instant_loader_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_loader.cc
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index 207038742e41cb40b430e9ad48a929bd0f36274e..35daebe2ca7d1a70785ee06c881973d42947db3d 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,8 +197,7 @@ bool InstantLoader::WebContentsDelegateImpl::OnMessageReceived(
void InstantLoader::WebContentsDelegateImpl::OnSetSuggestions(
int page_id,
- const std::vector<string16>& suggestions,
- InstantCompleteBehavior behavior) {
+ const std::vector<InstantSuggestion>& suggestions) {
DCHECK(loader_->preview_contents() &&
loader_->preview_contents_->web_contents());
// TODO(sreeram): Remove this 'if' bandaid once bug 141875 is confirmed fixed.
@@ -211,7 +209,7 @@ void InstantLoader::WebContentsDelegateImpl::OnSetSuggestions(
GetController().GetActiveEntry();
if (entry && page_id == entry->GetPageID()) {
MaybeSetAndNotifyInstantSupportDetermined(true);
- loader_->loader_delegate_->SetSuggestions(loader_, suggestions, behavior);
+ loader_->loader_delegate_->SetSuggestions(loader_, suggestions);
}
}
« no previous file with comments | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/instant/instant_loader_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698