Instant extended API: Make arrow up/down work.

chrome/browser/instant/instant_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
-#include "ui/gfx/codec/png_codec.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/widget/widget.h"
 #endif
 
 namespace {
 
 enum PreviewUsageType {
   PREVIEW_CREATED = 0,
   PREVIEW_DELETED,
@@ skipping 238 matching lines @@
       result.contents = match->description;
       result.destination_url = match->destination_url;
       result.relevance = match->relevance;
       results.push_back(result);
     }
   }
 
   loader_->SendAutocompleteResults(results);
 }
 
+bool InstantController::OnUpOrDownKeyPressed(int count) {
+  if (mode_ != EXTENDED || !GetPreviewContents())
+    return false;
+
+  loader_->OnUpOrDownKeyPressed(count);
+  return true;
+}
+
 TabContents* InstantController::GetPreviewContents() const {
   return loader_.get() ? loader_->preview_contents() : NULL;
 }
 
 void InstantController::Hide() {
   last_active_tab_ = NULL;
   if (is_showing_) {
     is_showing_ = false;
     delegate_->HideInstant();
   }
@@ skipping 174 matching lines @@
   DCHECK_EQ(loader_.get(), loader);
   if (loader_ != loader || IsOutOfDate() || mode_ == SILENT || mode_ == HIDDEN)
     return;
 
   loader_processed_last_update_ = true;
 
   InstantSuggestion suggestion;
   if (!suggestions.empty())
     suggestion = suggestions[0];
 
-  string16 suggestion_lower = base::i18n::ToLower(suggestion.text);
-  string16 user_text_lower = base::i18n::ToLower(last_user_text_);
-  if (user_text_lower.size() >= suggestion_lower.size() ||
-      suggestion_lower.compare(0, user_text_lower.size(), user_text_lower))
-    suggestion.text.clear();
-  else
-    suggestion.text.erase(0, last_user_text_.size());
+  if (suggestion.behavior == INSTANT_COMPLETE_REPLACE) {
+    // We don't get an Update() when changing the omnibox due to a REPLACE
+    // suggestion (so that we don't inadvertently cause the preview to change
+    // what it's showing, as the user arrows up/down through the page-provided
+    // suggestions). So, update these state variables here.
+    last_full_text_ = suggestion.text;
+    last_user_text_.clear();
+    last_verbatim_ = true;
+    last_suggestion_ = InstantSuggestion();
+    last_match_was_search_ = suggestion.type == INSTANT_SUGGESTION_SEARCH;
+    delegate_->SetSuggestedText(suggestion.text, suggestion.behavior);
+  } else {
+    string16 suggestion_lower = base::i18n::ToLower(suggestion.text);
+    string16 user_text_lower = base::i18n::ToLower(last_user_text_);
+    if (user_text_lower.size() >= suggestion_lower.size() ||
+        suggestion_lower.compare(0, user_text_lower.size(), user_text_lower))
+      suggestion.text.clear();
+    else
+      suggestion.text.erase(0, last_user_text_.size());
 
-  last_suggestion_ = suggestion;
-  if (!last_verbatim_)
-    delegate_->SetSuggestedText(suggestion.text, suggestion.behavior);
+    last_suggestion_ = suggestion;
+    if (!last_verbatim_)
+      delegate_->SetSuggestedText(suggestion.text, suggestion.behavior);
+  }
 
   if (mode_ != SUGGEST)
     Show();
 }
 
 void InstantController::CommitInstantLoader(InstantLoader* loader) {
   DCHECK_EQ(loader_.get(), loader);
   DCHECK(is_showing_ && !IsOutOfDate()) << is_showing_;
   if (loader_ != loader || !is_showing_ || IsOutOfDate())
     return;
@@ skipping 211 matching lines @@
       iter->second > kMaxInstantSupportFailures)
     return false;
 
   return true;
 }
 
 bool InstantController::IsOutOfDate() const {
   return !last_active_tab_ ||
          last_active_tab_ != delegate_->GetActiveTabContents();
 }