GTK: Draw the correct omnibox state with new tab-to-traverse behavior.

chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.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/ui/gtk/omnibox/omnibox_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 470 matching lines @@
                                      WindowOpenDisposition disposition) {
   // 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(line);
   omnibox_view_->OpenMatch(match, disposition, GURL(), line,
                            match.keyword);
 }
 
 const gfx::Image* OmniboxPopupViewGtk::IconForMatch(
-    const AutocompleteMatch& match, bool selected) {
+    const AutocompleteMatch& match, bool selected, bool is_selected_keyword) {

[Peter Kasting, 2012/03/01 22:02:12]

Nit: One arg per line

   const SkBitmap* bitmap = model_->GetIconIfExtensionMatch(match);
   if (bitmap) {
     if (!ContainsKey(images_, bitmap)) {
       // gfx::Image wants ownership of bitmaps given to it, and we might as
       // well make the bitmap copy a format that will be used.
       images_[bitmap] = new gfx::Image(gfx::GdkPixbufFromSkBitmap(bitmap));
     }
     return images_[bitmap];
   }
 
-  int icon = match.starred ?
-      IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match.type);
+  int icon;
+  if (is_selected_keyword)
+    icon = IDR_OMNIBOX_TTS;
+  else if (match.starred)
+    icon = IDR_OMNIBOX_STAR;
+  else
+    icon = AutocompleteMatch::TypeToIcon(match.type);
+
   if (selected) {
     switch (icon) {
       case IDR_OMNIBOX_EXTENSION_APP:
         icon = IDR_OMNIBOX_EXTENSION_APP_DARK;
         break;
       case IDR_OMNIBOX_HTTP:
         icon = IDR_OMNIBOX_HTTP_DARK;
         break;
       case IDR_OMNIBOX_HISTORY:
         icon = IDR_OMNIBOX_HISTORY_DARK;
         break;
       case IDR_OMNIBOX_SEARCH:
         icon = IDR_OMNIBOX_SEARCH_DARK;
         break;
       case IDR_OMNIBOX_STAR:
         icon = IDR_OMNIBOX_STAR_DARK;
         break;
+      case IDR_OMNIBOX_TTS:
+        icon = IDR_OMNIBOX_TTS_DARK;
+        break;
       default:
         NOTREACHED();
         break;
     }
   }
 
   return theme_service_->GetImageNamed(icon);
 }
 
+void OmniboxPopupViewGtk::GetForMatch(size_t index,
+                                      const AutocompleteMatch** match,
+                                      bool* is_selected_keyword) {
+  const AutocompleteResult& result = model_->result();
+
+  if (result.match_at(index).associated_keyword.get() &&
+      model_->selected_line() == index &&
+      model_->selected_line_state() == AutocompletePopupModel::KEYWORD) {
+    *match = result.match_at(index).associated_keyword.get();
+    *is_selected_keyword = true;
+    return;
+  }
+
+  *match = &result.match_at(index);
+  *is_selected_keyword = false;
+}
+
 gboolean OmniboxPopupViewGtk::HandleMotion(GtkWidget* widget,
                                            GdkEventMotion* event) {
   // TODO(deanm): Windows has a bunch of complicated logic here.
   size_t line = LineFromY(static_cast<int>(event->y));
   // There is both a hovered and selected line, hovered just means your mouse
   // is over it, but selected is what's showing in the location edit.
   model_->SetHoveredLine(line);
   // Select the line if the user has the left mouse button down.
   if (!ignore_mouse_drag_ && (event->state & GDK_BUTTON1_MASK))
     model_->SetSelectedLine(line, false, false);
@@ skipping 63 matching lines @@
   cairo_stroke(cr);
 
   pango_layout_set_height(layout_, kHeightPerResult * PANGO_SCALE);
 
   for (size_t i = 0; i < result.size(); ++i) {
     gfx::Rect line_rect = GetRectForLine(i, window_rect.width());
     // Only repaint and layout damaged lines.
     if (!line_rect.Intersects(damage_rect))
       continue;
 
-    const AutocompleteMatch& match = result.match_at(i);
+    const AutocompleteMatch* match = NULL;
+    bool is_selected_keyword = false;
+    GetForMatch(i, &match, &is_selected_keyword);
     bool is_selected = (model_->selected_line() == i);
     bool is_hovered = (model_->hovered_line() == i);
     if (is_selected || is_hovered) {
       gdk_cairo_set_source_color(cr, is_selected ? &selected_background_color_ :
                                  &hovered_background_color_);
       // This entry is selected or hovered, fill a rect with the color.
       cairo_rectangle(cr, line_rect.x(), line_rect.y(),
                       line_rect.width(), line_rect.height());
       cairo_fill(cr);
     }
 
     int icon_start_x = ltr ? kIconLeftPadding :
         (line_rect.width() - kIconLeftPadding - kIconWidth);
     // Draw the icon for this result.
     DrawFullImage(cr, widget,
-                  IconForMatch(match, is_selected),
+                  IconForMatch(*match, is_selected, is_selected_keyword),
                   icon_start_x, line_rect.y() + kIconTopPadding);
 
     // Draw the results text vertically centered in the results space.
     // First draw the contents / url, but don't let it take up the whole width
     // if there is also a description to be shown.
-    bool has_description = !match.description.empty();
+    bool has_description = !match->description.empty();
     int text_width = window_rect.width() - (kIconAreaWidth + kRightPadding);
     int allocated_content_width = has_description ?
         static_cast<int>(text_width * kContentWidthPercentage) : text_width;
     pango_layout_set_width(layout_, allocated_content_width * PANGO_SCALE);
 
     // Note: We force to URL to LTR for all text directions.
-    SetupLayoutForMatch(layout_, match.contents, match.contents_class,
+    SetupLayoutForMatch(layout_, match->contents, match->contents_class,
                         is_selected ? &selected_content_text_color_ :
                             &content_text_color_,
                         is_selected ? &selected_content_dim_text_color_ :
                             &content_dim_text_color_,
                         is_selected ? &url_selected_text_color_ :
                             &url_text_color_,
                         std::string());
 
     int actual_content_width, actual_content_height;
     pango_layout_get_size(layout_,
@@ skipping 14 matching lines @@
     pango_cairo_show_layout(cr, layout_);
     cairo_restore(cr);
 
     if (has_description) {
       pango_layout_set_width(layout_,
           (text_width - actual_content_width) * PANGO_SCALE);
 
       // In Windows, a boolean "force_dim" is passed as true for the
       // description.  Here, we pass the dim text color for both normal and dim,
       // to accomplish the same thing.
-      SetupLayoutForMatch(layout_, match.description, match.description_class,
+      SetupLayoutForMatch(layout_, match->description, match->description_class,
                           is_selected ? &selected_content_dim_text_color_ :
                               &content_dim_text_color_,
                           is_selected ? &selected_content_dim_text_color_ :
                               &content_dim_text_color_,
                           is_selected ? &url_selected_text_color_ :
                               &url_text_color_,
                           std::string(" - "));
       gint actual_description_width;
       pango_layout_get_size(layout_, &actual_description_width, NULL);
 
       cairo_save(cr);
       cairo_move_to(cr, ltr ?
                     (kIconAreaWidth + actual_content_width) :
                     (text_width - actual_content_width -
                      (actual_description_width / PANGO_SCALE)),
                     content_y);
       pango_cairo_show_layout(cr, layout_);
       cairo_restore(cr);
     }
+
+    if (match->associated_keyword.get()) {
+      // If this entry has an associated keyword, draw the arrow at the extreme
+      // other side of the omnibox.
+      icon_start_x = ltr ? (line_rect.width() - kIconLeftPadding - kIconWidth) :
+                     kIconLeftPadding;

[Peter Kasting, 2012/03/01 22:02:12]

Nit: Indent 4

+      // Draw the icon for this result.
+      DrawFullImage(cr, widget,
+                    theme_service_->GetImageNamed(
+                        is_selected ? IDR_OMNIBOX_TTS_DARK : IDR_OMNIBOX_TTS),
+                    icon_start_x, line_rect.y() + kIconTopPadding);
+    }
   }
 
   cairo_destroy(cr);
   return TRUE;
 }