Enabled pressing TAB to cycle through the Omnibox results.

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

 // 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"
 
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/instant/promo_counter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/views/autocomplete/autocomplete_result_view.h"
 #include "chrome/browser/ui/views/bubble/bubble_border.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
+#include "ui/gfx/rect.h"
 #include "unicode/ubidi.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 #include "views/painter.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include <commctrl.h>
@@ skipping 98 matching lines @@
 }  // namespace
 
 class AutocompletePopupContentsView::AutocompletePopupWidget
     : public views::Widget,
       public base::SupportsWeakPtr<AutocompletePopupWidget> {
  public:
   AutocompletePopupWidget() {}
   virtual ~AutocompletePopupWidget() {}
 
  private:
-   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWidget);
+  DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWidget);
 };
 
 class AutocompletePopupContentsView::InstantOptInView
     : public views::View,
       public views::ButtonListener {
  public:
   InstantOptInView(AutocompletePopupContentsView* contents_view,
                    const gfx::Font& label_font,
                    const gfx::Font& button_font)
       : contents_view_(contents_view),
@@ skipping 83 matching lines @@
       result_bold_font_(result_font_.DeriveFont(0, gfx::Font::BOLD)),
       ignore_mouse_drag_(false),
       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.
   BubbleBorder* bubble_border = new BubbleBorder(BubbleBorder::NONE);
   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 * 2; ++i) {
+    AutocompleteResultView* result_view =
+        CreateResultView(this, i, result_font_, result_bold_font_);
+    AddChildViewAt(result_view, static_cast<int>(i));
+    result_view->SetVisible(false);
+
+    if (i < AutocompleteResult::kMaxMatches) {
+      keyword_animations_.push_back(new ui::SlideAnimation(this));
+    }
+  }
 }
 
 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())
     return target_bounds_;
 
   gfx::Rect current_frame_bounds = start_bounds_;
   int total_height_delta = target_bounds_.height() - start_bounds_.height();
   // Round |current_height_delta| instead of truncating so we won't leave single
   // white pixels at the bottom of the popup as long when animating very small
   // height differences.
   int current_height_delta = static_cast<int>(
       size_animation_.GetCurrentValue() * total_height_delta - 0.5);
   current_frame_bounds.set_height(
       current_frame_bounds.height() + current_height_delta);
   return current_frame_bounds;
 }
 
 void AutocompletePopupContentsView::LayoutChildren() {
   gfx::Rect contents_rect = GetContentsBounds();
   int top = contents_rect.y();
-  for (int i = 0; i < child_count(); ++i) {
-    View* v = child_at(i);
-    if (v->IsVisible()) {
-      v->SetBounds(contents_rect.x(), top, contents_rect.width(),
-                   v->GetPreferredSize().height());
-      top = v->bounds().bottom();
+
+  for (int i = 0; i < child_count(); i += 2) {
+    View* result = child_at(i);
+    if (!result->IsVisible())
+      continue;
+
+    View* keyword = child_at(i + 1);
+    if (keyword->IsVisible()) {
+      DCHECK(keyword->GetClassName() ==
+          AutocompleteResultView::kViewClassName);
+      AutocompleteResultView* kw_result =
+          static_cast<AutocompleteResultView*>(keyword);
+      const int collapsed_width = kw_result->GetCollapsedSize().width() +
+          LocationBarView::kEdgeItemPadding;
+      const int kw_collapsed_x = contents_rect.width() - collapsed_width;
+      const int kw_x = contents_rect.width() -
+          keyword_animations_[i / 2]->CurrentValueBetween(collapsed_width,
+              kw_collapsed_x);
+
+      result->SetBounds(contents_rect.x(), top,
+          kw_x - LocationBarView::kNormalHorizontalEdgeThickness,
+          result->GetPreferredSize().height());
+      keyword->SetBounds(contents_rect.x() + kw_x, top,
+          contents_rect.width() - kw_x, keyword->GetPreferredSize().height());
+    } else {
+      result->SetBounds(contents_rect.x(), top, contents_rect.width(),
+          result->GetPreferredSize().height());
     }
+    top = result->bounds().bottom();
   }
+
+  if (opt_in_view_ && opt_in_view_->IsVisible())
+    opt_in_view_->SetBounds(contents_rect.x(), top, contents_rect.width(),
+        opt_in_view_->GetPreferredSize().height());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, AutocompletePopupView overrides:
 
 bool AutocompletePopupContentsView::IsOpen() const {
   return (popup_ != NULL);
 }
 
 void AutocompletePopupContentsView::InvalidateLine(size_t line) {
-  child_at(static_cast<int>(line))->SchedulePaint();
+  child_at(static_cast<int>(line * 2))->SchedulePaint();
+  child_at(static_cast<int>(line * 2 + 1))->SchedulePaint();
+
+  if (line == model_->selected_line() &&
+      model_->selected_match() == AutocompletePopupModel::KEYWORD)
+    keyword_animations_[line]->Show();
+  else
+    keyword_animations_[line]->Hide();
 }
 
 void AutocompletePopupContentsView::UpdatePopupAppearance() {
   if (model_->result().empty()) {
     // No matches, close any existing popup.
     if (popup_ != NULL) {
       size_animation_.Stop();
+
+      for (SlideAnimations::iterator i(keyword_animations_.begin());
+          i != keyword_animations_.end(); ++i)
+        (*i)->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(child_rv_count > 0);
     child_rv_count--;
   }
-  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));
+  const size_t result_size = model_->result().size();
+  for (size_t i = 0; i < result_size; ++i) {
+    const AutocompleteMatch& match = GetMatchAtIndex(i);
+    DCHECK(child_at(i * 2)->GetClassName() ==
+        AutocompleteResultView::kViewClassName);
+    AutocompleteResultView* view = static_cast<AutocompleteResultView*>(
+        child_at(i * 2));
+    view->SetMatch(match);
+    view->SetVisible(true);
+
+    DCHECK(child_at(i * 2 + 1)->GetClassName() ==
+        AutocompleteResultView::kViewClassName);
+    view = static_cast<AutocompleteResultView*>(child_at(i * 2 + 1));
+    view->SetVisible(match.associated_keyword.get() != NULL);
+    if (view->IsVisible())
+      view->SetMatch(*match.associated_keyword);
+
+    keyword_animations_[i]->Reset();
   }
-  for (size_t i = model_->result().size(); i < child_rv_count; ++i)
+  for (size_t i = result_size * 2; i < child_rv_count; ++i)
     child_at(i)->SetVisible(false);
 
   PromoCounter* counter = model_->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 26 matching lines @@
     // Animate the popup shrinking, but don't animate growing larger since that
     // would make the popup feel less responsive.
     start_bounds_ = GetWidget()->GetWindowScreenBounds();
     if (target_bounds_.height() < start_bounds_.height())
       size_animation_.Show();
     else
       start_bounds_ = target_bounds_;
     popup_->SetBounds(GetPopupBounds());
   }
 
-  SchedulePaint();
+  Layout();
 }
 
 gfx::Rect AutocompletePopupContentsView::GetTargetBounds() {
   return target_bounds_;
 }
 
 void AutocompletePopupContentsView::PaintUpdatesNow() {
   // TODO(beng): remove this from the interface.
 }
 
 void AutocompletePopupContentsView::OnDragCanceled() {
   ignore_mouse_drag_ = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, AutocompleteResultViewModel implementation:
 
 bool AutocompletePopupContentsView::IsSelectedIndex(size_t index) const {
-  return HasMatchAt(index) ? index == model_->selected_line() : false;
+  size_t selected_line = model_->selected_line() * 2;
+
+  if (model_->selected_match() == AutocompletePopupModel::KEYWORD)
+    selected_line++;
+
+  return index == selected_line;
 }
 
 bool AutocompletePopupContentsView::IsHoveredIndex(size_t index) const {
-  return HasMatchAt(index) ? index == model_->hovered_line() : false;
+  return index == model_->hovered_line() * 2;
 }
 
 const SkBitmap* AutocompletePopupContentsView::GetIconIfExtensionMatch(
     size_t index) const {
   if (!HasMatchAt(index))
     return NULL;
   return model_->GetIconIfExtensionMatch(GetMatchAtIndex(index));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, AnimationDelegate implementation:
 
 void AutocompletePopupContentsView::AnimationProgressed(
     const ui::Animation* animation) {
   // We should only be running the animation when the popup is already visible.
   DCHECK(popup_ != NULL);
   popup_->SetBounds(GetPopupBounds());
+
+  Layout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, views::View overrides:
 
 void AutocompletePopupContentsView::Layout() {
   UpdateBlurRegion();
 
   // Size our children to the available content area.
   LayoutChildren();
@@ skipping 73 matching lines @@
   model_->SetHoveredLine(AutocompletePopupModel::kNoMatch);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, protected:
 
 void AutocompletePopupContentsView::PaintResultViews(gfx::CanvasSkia* canvas) {
   canvas->drawColor(AutocompleteResultView::GetColor(
       AutocompleteResultView::NORMAL, AutocompleteResultView::BACKGROUND));
   View::PaintChildren(canvas);
+
+  // Draw dividing lines between results and keyword views.
+  SkPaint paint;
+  paint.setColor(AutocompleteResultView::GetColor(
+      AutocompleteResultView::NORMAL, AutocompleteResultView::DIMMED_TEXT));
+  paint.setStrokeWidth(SkIntToScalar(1));
+  paint.setAntiAlias(true);
+
+  for (size_t i = 0; i < model_->result().size(); ++i) {
+    if (model_->result().match_at(i).associated_keyword.get()) {
+      views::View* child = child_at(i * 2);
+      gfx::Rect bounds = child->bounds();
+
+      canvas->drawLine(

[Peter Kasting, 2011/08/04 20:07:53]

Nit: This won't make a visible difference, but since you reserve
kNormalHorizontalEdgeThickness worth of width, I suggest using a rect-drawing
function here that draws a rect with that width, which will automatically do the
right thing if we change it.

[aaron.randolph, 2011/08/04 22:32:25]

Drawing with a rect makes the line darker and narrower, which doesn't look as
nice IMO.  You can alleviate this somewhat by setting alpha to 50% but it still
doesn't look the same. What I can do instead is set the stroke width to
kNormalHorizontalEdgeThickness instead of hard coding it to 1, which should also
do the right thing.

[Peter Kasting, 2011/08/04 23:13:16]

Were you using FillRectInt()?  Use that, not DrawRectInt().
I really want to find a way to do this with rectangles.  For many reasons, our
Skia line-drawing routines are broken and I'm trying to eliminate them entirely
from the code.  So even though setting a stroke width would work, I'd rather not
do it.

[aaron.randolph, 2011/08/05 00:52:26]

Yes, I tried FillRectInt first and then various other calls.  The main issue I'm
seeing is that the rect drawing calls don't reflect the anti-alias flag, at
least for pixel-wide rects, so you get a narrow, dark line, instead of a nice
anti-aliased line.  I can push up my current version (which also addresses the
other comments) if you want to see what it looks like, or I can email you
screenshots of the difference.

+          SkIntToScalar(bounds.right()),
+          SkIntToScalar(bounds.y() +
+              LocationBarView::kNormalHorizontalEdgeThickness),

[Peter Kasting, 2011/08/04 20:07:53]

Nit: It's wrong to use this constant to do vertical offsets.  How do things look
if you just draw through the entire row height?  If they're not great, I suggest
defining a local constant and using that.

+          SkIntToScalar(bounds.right()),
+          SkIntToScalar(bounds.y() + bounds.height() -
+              LocationBarView::kNormalHorizontalEdgeThickness * 2),
+          paint);
+    }
+  }
 }
 
 int AutocompletePopupContentsView::CalculatePopupHeight() {
   DCHECK_GE(static_cast<size_t>(child_count()), model_->result().size());
   int popup_height = 0;
   for (size_t i = 0; i < model_->result().size(); ++i)
     popup_height += child_at(i)->GetPreferredSize().height();
   return popup_height +
       (opt_in_view_ ? opt_in_view_->GetPreferredSize().height() : 0);
 }
@@ skipping 116 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,
-                         is_keyword_hint ? string16() : keyword);
+      match.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) {
-    views::View* child = child_at(i);
+    views::View* child = child_at(i * 2);
     gfx::Point point_in_child_coords(point);
     View::ConvertPointToView(this, child, &point_in_child_coords);
     if (child->HitTest(point_in_child_coords))
       return i;
   }
   return AutocompletePopupModel::kNoMatch;
 }
 
 gfx::Rect AutocompletePopupContentsView::CalculateTargetBounds(int h) {
   gfx::Rect location_bar_bounds(location_bar_->GetContentsBounds());
@@ skipping 23 matching lines @@
   opt_in_view_ = NULL;
   PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
   DCHECK(counter);
   counter->Hide();
   if (opt_in) {
     browser::ShowInstantConfirmDialogIfNecessary(
         location_bar_->GetWidget()->GetNativeWindow(), model_->profile());
   }
   UpdatePopupAppearance();
 }