| Index: chrome/browser/instant/instant_controller.cc
|
| diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
|
| index 80f9b796a4cf181a57ac371c9af2bab3abe1c1df..ff5a9388da6d3d0c452713ec920f771df9e7191d 100644
|
| --- a/chrome/browser/instant/instant_controller.cc
|
| +++ b/chrome/browser/instant/instant_controller.cc
|
| @@ -509,6 +509,21 @@ bool InstantController::OnUpOrDownKeyPressed(int count) {
|
| return true;
|
| }
|
|
|
| +bool InstantController::OnCancel(string16 user_text) {
|
| + if (!extended_enabled_)
|
| + return false;
|
| +
|
| + if (!instant_tab_ && !overlay_)
|
| + return false;
|
| +
|
| + if (instant_tab_)
|
| + instant_tab_->CancelSelection(user_text);
|
| + else
|
| + overlay_->CancelSelection(user_text);
|
| +
|
| + return true;
|
| +}
|
| +
|
| content::WebContents* InstantController::GetPreviewContents() const {
|
| return overlay_ ? overlay_->contents() : NULL;
|
| }
|
|
|