Vectorize LocationIconView icons

chrome/browser/ui/views/location_bar/location_bar_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.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
@@ skipping 61 matching lines @@
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.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/compositor/paint_recorder.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/slide_animation.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/image/image_skia_operations.h"
+#include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
@@ skipping 1272 matching lines @@
 }
 
 void LocationBarView::AnimationEnded(const gfx::Animation* animation) {
   browser_->window()->ToolbarSizeChanged(false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private OmniboxEditController implementation:
 
 void LocationBarView::OnChanged() {
-  int icon_id = omnibox_view_->GetIcon();
-  location_icon_view_->SetImage(GetThemeProvider()->GetImageSkiaNamed(icon_id));
+  location_icon_view_->SetImage(
+      ui::MaterialDesignController::IsModeMaterial()
+          ? gfx::CreateVectorIcon(omnibox_view_->GetVectorIcon(), 16,
+                                  gfx::kChromeIconGrey)

[Peter Kasting, 2015/10/21 19:45:47]

This has a similar problem to the one I mentioned in your previous icon review
where the grey is hardcoded and we should probably
BlendTowardOppositeLuminance() or the like depending on the omnibox background
color.

[Evan Stade, 2015/10/21 23:20:01]

maybe I should try to figure this one out before proceeding with the CL. The
tricky thing is that Sebastien wants to swap the green and white in the https
icon for dark themes (not something we could easily do automatically).

[Evan Stade, 2015/11/06 00:15:21]

After looking at this a little more, I believe we'll want a strategy where we
pick from one of two color schemes rather than picking one color/set of colors
and somehow modifying based on the background. Sebastien provided the color to
use for a white bg and for a black bg, so I think the code should do something
like "pick whichever of these two colors has greater contrast to the background"
(perhaps after that we can modify to make sure it's readable, if we care about
supporting random backgrounds like green).

This encompasses location bar chips and other text in the location bar, so I
think it can be punted for now until we address all of that simultaneously (I
gather we'll have to do that soon to support dark bg for incognito).

tldr I assume the LGs are still good and I'll just rebase and land this as is.

+          : *GetThemeProvider()->GetImageSkiaNamed(omnibox_view_->GetIcon()));
   location_icon_view_->ShowTooltip(!GetOmniboxView()->IsEditingOrEmpty());
 
   Layout();
   SchedulePaint();
 }
 
 void LocationBarView::OnSetFocus() {
   GetFocusManager()->SetFocusedView(this);
 }
 
@@ skipping 29 matching lines @@
 
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }