Vectorize omnibox dropdown icons

chrome/browser/ui/views/omnibox/omnibox_result_view.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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
 #endif
@@ skipping 12 matching lines @@
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "grit/components_scaled_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/text_utils.h"
+#include "ui/gfx/vector_icons_public.h"
 
 using ui::NativeTheme;
 
 namespace {
 
 // A mapping from OmniboxResultView's ResultViewState/ColorKind types to
 // NativeTheme colors.
 struct TranslationTable {
   ui::NativeTheme::ColorId id;
   OmniboxResultView::ResultViewState state;
@@ skipping 512 matching lines @@
 
 const char* OmniboxResultView::GetClassName() const {
   return "OmniboxResultView";
 }
 
 gfx::ImageSkia OmniboxResultView::GetIcon() const {
   const gfx::Image image = model_->GetIconIfExtensionMatch(model_index_);
   if (!image.IsEmpty())
     return image.AsImageSkia();
 
+  if (ui::MaterialDesignController::IsModeMaterial())
+    return GetMaterialIcon();

[Peter Kasting, 2015/10/20 01:02:59]

Nit: I dunno if separating this into its own helper buys much, especially since
we need to explain what the function is in the .h file.  I'd probably just
inline the helper code here.

[Evan Stade, 2015/10/20 01:12:09]

Done.

+
   int icon = model_->IsStarredMatch(match_) ?
       IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match_.type);
-  if (GetState() == SELECTED &&
-      !ui::MaterialDesignController::IsModeMaterial()) {
+  if (GetState() == SELECTED) {
     switch (icon) {
       case IDR_OMNIBOX_CALCULATOR:
         icon = IDR_OMNIBOX_CALCULATOR_SELECTED;
         break;
       case IDR_OMNIBOX_EXTENSION_APP:
         icon = IDR_OMNIBOX_EXTENSION_APP_SELECTED;
         break;
       case IDR_OMNIBOX_HTTP:
         icon = IDR_OMNIBOX_HTTP_SELECTED;
         break;
       case IDR_OMNIBOX_SEARCH:
         icon = IDR_OMNIBOX_SEARCH_SELECTED;
         break;
       case IDR_OMNIBOX_STAR:
         icon = IDR_OMNIBOX_STAR_SELECTED;
         break;
       default:
         NOTREACHED();
         break;
     }
   }
   return *(location_bar_view_->GetThemeProvider()->GetImageSkiaNamed(icon));
 }
 
+gfx::ImageSkia OmniboxResultView::GetMaterialIcon() const {
+  gfx::VectorIconId icon_id = model_->IsStarredMatch(match_) ?
+      gfx::VectorIconId::OMNIBOX_STAR :
+      AutocompleteMatch::TypeToVectorIcon(match_.type);
+  return gfx::CreateVectorIcon(icon_id, 16, gfx::kChromeIconGrey);

[Peter Kasting, 2015/10/20 01:02:59]

Using grey here will be problematic for dropdowns with a non-white background. 
(This is an existing bug with the images used today, that we can now fix.)  We
should probably use color_utils::BlendTowardOppositeLuminance() with the
dropdown background color, and choose an alpha that results in the same color as
this grey when used with white backgrounds.

[Evan Stade, 2015/10/20 01:12:09]

I didn't even realize the dropdown could change. Is that done for inverted color
schemes on Windows or something?

[Peter Kasting, 2015/10/20 01:39:18]

Yes.  It's supposed to use the system window color.  I think there might have
been a bug introduced in a rewrite where it only currently does that on GTK and
not Win, though, based on code inspection.  In any case, the color is attainable
from GetColor(state, BACKGROUND);.  This depends on the current state because we
might need a different color in a normal row versus a hovered one.

+}
+
 const gfx::ImageSkia* OmniboxResultView::GetKeywordIcon() const {
   // NOTE: If we ever begin returning icons of varying size, then callers need
   // to ensure that |keyword_icon_| is resized each time its image is reset.
   int icon = IDR_OMNIBOX_TTS;
   if (GetState() == SELECTED && !ui::MaterialDesignController::IsModeMaterial())
     icon = IDR_OMNIBOX_TTS_SELECTED;
 
   return location_bar_view_->GetThemeProvider()->GetImageSkiaNamed(icon);
 }
 
@@ skipping 195 matching lines @@
 
 int OmniboxResultView::StartMargin() const {
   return ui::MaterialDesignController::IsModeMaterial() ?
       model_->start_margin() : 0;
 }
 
 int OmniboxResultView::EndMargin() const {
   return ui::MaterialDesignController::IsModeMaterial() ?
       model_->end_margin() : 0;
 }