Revert 120005 - Enabled pressing TAB to traverse through the Omnibox results, removed moving the ...

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/ui/views/autocomplete/autocomplete_popup_contents_view.h"
 
 #if defined(OS_WIN)
 #include <commctrl.h>
 #include <dwmapi.h>
 #include <objidl.h>
 #endif
@@ skipping 33 matching lines @@
 #endif
 #endif
 #if defined(USE_AURA)
 #include "ash/wm/window_animations.h"
 #endif
 
 namespace {
 
 const SkAlpha kGlassPopupAlpha = 240;
 const SkAlpha kOpaquePopupAlpha = 255;
-
 // The size delta between the font used for the edit and the result rows. Passed
 // to gfx::Font::DeriveFont.
 #if defined(OS_CHROMEOS)
 // Don't adjust the size on Chrome OS (http://crbug.com/61433).
 const int kEditFontAdjust = 0;
 #else
 const int kEditFontAdjust = -1;
 #endif
 
 // Horizontal padding between the buttons on the opt in promo.
@@ skipping 163 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)) {
   // The following little dance is required because set_border() requires a
   // pointer to a non-const object.
   views::BubbleBorder* bubble_border =
       new views::BubbleBorder(views::BubbleBorder::NONE,
                               views::BubbleBorder::NO_SHADOW);
   bubble_border_ = bubble_border;
   set_border(bubble_border);
   // The contents is owned by the LocationBarView.
   set_parent_owned(false);
-
-  for (size_t i = 0; i < AutocompleteResult::kMaxMatches; ++i) {
-    AutocompleteResultView* result_view =
-        CreateResultView(this, i, result_font_, result_bold_font_);
-    result_view->SetVisible(false);
-    AddChildViewAt(result_view, static_cast<int>(i));
-  }
 }
 
 AutocompletePopupContentsView::~AutocompletePopupContentsView() {
   // We don't need to do anything with |popup_| here.  The OS either has already
   // closed the window, in which case it's been deleted, or it will soon, in
   // which case there's nothing we need to do.
 }
 
 gfx::Rect AutocompletePopupContentsView::GetPopupBounds() const {
   if (!size_animation_.is_animating())
@@ skipping 25 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, AutocompletePopupView overrides:
 
 bool AutocompletePopupContentsView::IsOpen() const {
   return (popup_ != NULL);
 }
 
 void AutocompletePopupContentsView::InvalidateLine(size_t line) {
-  AutocompleteResultView* result = static_cast<AutocompleteResultView*>(
-      child_at(static_cast<int>(line)));
-  result->Invalidate();
-
-  if (HasMatchAt(line) && GetMatchAtIndex(line).associated_keyword.get()) {
-    result->ShowKeyword(IsSelectedIndex(line) &&
-        model_->selected_line_state() == AutocompletePopupModel::KEYWORD);
-  }
+  child_at(static_cast<int>(line))->SchedulePaint();
 }
 
 void AutocompletePopupContentsView::UpdatePopupAppearance() {
   if (model_->result().empty()) {
     // No matches, close any existing popup.
     if (popup_ != NULL) {
       size_animation_.Stop();
-
       // NOTE: Do NOT use CloseNow() here, as we may be deep in a callstack
       // triggered by the popup receiving a message (e.g. LBUTTONUP), and
       // destroying the popup would cause us to read garbage when we unwind back
       // to that level.
       popup_->Close();  // This will eventually delete the popup.
       popup_.reset();
     }
     return;
   }
 
   // Update the match cached by each row, in the process of doing so make sure
   // we have enough row views.
   size_t child_rv_count = child_count();
   if (opt_in_view_) {
     DCHECK_GT(child_rv_count, 0u);
     child_rv_count--;
   }
-  const size_t result_size = model_->result().size();
-  for (size_t i = 0; i < result_size; ++i) {
-    AutocompleteResultView* view = static_cast<AutocompleteResultView*>(
-        child_at(i));
-    view->SetMatch(GetMatchAtIndex(i));
-    view->SetVisible(true);
+  for (size_t i = 0; i < model_->result().size(); ++i) {
+    AutocompleteResultView* result_view;
+    if (i >= child_rv_count) {
+      result_view =
+          CreateResultView(this, i, result_font_, result_bold_font_);
+      AddChildViewAt(result_view, static_cast<int>(i));
+    } else {
+      result_view = static_cast<AutocompleteResultView*>(child_at(i));
+      result_view->SetVisible(true);
+    }
+    result_view->SetMatch(GetMatchAtIndex(i));
   }
-  for (size_t i = result_size; i < child_rv_count; ++i)
+  for (size_t i = model_->result().size(); i < child_rv_count; ++i)
     child_at(i)->SetVisible(false);
 
   PromoCounter* counter = profile_->GetInstantPromoCounter();
   if (!opt_in_view_ && counter && counter->ShouldShow(base::Time::Now())) {
     opt_in_view_ = new InstantOptInView(this, result_bold_font_, result_font_);
     AddChildView(opt_in_view_);
   } else if (opt_in_view_ && (!counter ||
                               !counter->ShouldShow(base::Time::Now()))) {
     delete opt_in_view_;
     opt_in_view_ = NULL;
@@ skipping 57 matching lines @@
 }
 
 void AutocompletePopupContentsView::OnDragCanceled() {
   ignore_mouse_drag_ = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, AutocompleteResultViewModel implementation:
 
 bool AutocompletePopupContentsView::IsSelectedIndex(size_t index) const {
-  return index == model_->selected_line();
+  return HasMatchAt(index) ? index == model_->selected_line() : false;
 }
 
 bool AutocompletePopupContentsView::IsHoveredIndex(size_t index) const {
-  return index == model_->hovered_line();
+  return HasMatchAt(index) ? index == model_->hovered_line() : false;
 }
 
 const SkBitmap* AutocompletePopupContentsView::GetIconIfExtensionMatch(
     size_t index) const {
   if (!HasMatchAt(index))
     return NULL;
   return model_->GetIconIfExtensionMatch(GetMatchAtIndex(index));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 15 matching lines @@
   // Size our children to the available content area.
   LayoutChildren();
 
   // We need to manually schedule a paint here since we are a layered window and
   // won't implicitly require painting until we ask for one.
   SchedulePaint();
 }
 
 views::View* AutocompletePopupContentsView::GetEventHandlerForPoint(
     const gfx::Point& point) {
-  // If there is no opt in view then we want all mouse events. Otherwise, let
+  // If there is no opt in view, then we want all mouse events. Otherwise let
   // any descendants of the opt-in view get mouse events.
   if (!opt_in_view_)
     return this;
 
   views::View* child = views::View::GetEventHandlerForPoint(point);
   views::View* ancestor = child;
   while (ancestor && ancestor != opt_in_view_)
     ancestor = ancestor->parent();
   return ancestor ? child : this;
 }
@@ skipping 190 matching lines @@
 void AutocompletePopupContentsView::OpenIndex(
     size_t index,
     WindowOpenDisposition disposition) {
   if (!HasMatchAt(index))
     return;
 
   // OpenMatch() may close the popup, which will clear the result set and, by
   // extension, |match| and its contents.  So copy the relevant match out to
   // make sure it stays alive until the call completes.
   AutocompleteMatch match = model_->result().match_at(index);
+  string16 keyword;
+  const bool is_keyword_hint = model_->GetKeywordForMatch(match, &keyword);
   omnibox_view_->OpenMatch(match, disposition, GURL(), index,
-      match.keyword);
+                         is_keyword_hint ? string16() : keyword);
 }
 
 size_t AutocompletePopupContentsView::GetIndexForPoint(
     const gfx::Point& point) {
   if (!HitTest(point))
     return AutocompletePopupModel::kNoMatch;
 
   int nb_match = model_->result().size();
   DCHECK(nb_match <= child_count());
   for (int i = 0; i < nb_match; ++i) {
@@ skipping 34 matching lines @@
   opt_in_view_ = NULL;
   PromoCounter* counter = profile_->GetInstantPromoCounter();
   DCHECK(counter);
   counter->Hide();
   if (opt_in) {
     browser::ShowInstantConfirmDialogIfNecessary(
         location_bar_->GetWidget()->GetNativeWindow(), profile_);
   }
   UpdatePopupAppearance();
 }