Update search chip icon for MD, vectorize.

chrome/browser/ui/views/location_bar/icon_label_bubble_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/icon_label_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/layout_constants.h"
+#include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/painter.h"
 
 namespace {
 
 SkColor CalculateImageColor(gfx::ImageSkia* image) {
   // We grab the color of the middle pixel of the image, which we treat as
@@ skipping 74 matching lines @@
 double IconLabelBubbleView::WidthMultiplier() const {
   return 1.0;
 }
 
 gfx::Size IconLabelBubbleView::GetPreferredSize() const {
   // Height will be ignored by the LocationBarView.
   return GetSizeForLabelWidth(label_->GetPreferredSize().width());
 }
 
 void IconLabelBubbleView::Layout() {
+  // In MD mode, both extension icons and Chrome-provided icons are 16px,
+  // so it's not necessary to handle them differently. TODO(estade): clean
+  // this up when MD is on by default.
+  bool is_extension_icon = ui::MaterialDesignController::IsModeMaterial() ?

[Peter Kasting, 2015/10/23 23:44:09]

Nit: Seems clearer?

  bool is_extension_icon =
      is_extension_icon_ && !ui::MaterialDesignController::IsModeMaterial();

+      false : is_extension_icon_;

[Peter Kasting, 2015/10/23 23:44:09]

Nit: Seems clearer?

  bool is_extension_icon =
      is_extension_icon_ && !ui::MaterialDesignController::IsModeMaterial();

Although since this is the only place this variable is handled, maybe instead we
should put the conditional in set_extension_icon(), since that way when we
switch to full-time MD, it will be obvious we don't need the member anymore?

Also since the only way we use this is by negating it below, maybe we should
name it something else like is_default_icon or icon_needs_padding or something?

[Evan Stade, 2015/10/26 19:29:19]

done
not done because it feels wrong to say "this extension icon is not an extension
icon because it's MD"
done

   const int image_width = image()->GetPreferredSize().width();
   image_->SetBounds(std::min((width() - image_width) / 2,
-                             GetBubbleOuterPadding(!is_extension_icon_)),
+                             GetBubbleOuterPadding(!is_extension_icon)),
                     0, image_->GetPreferredSize().width(), height());
 
   const int padding = GetLayoutConstant(ICON_LABEL_VIEW_INTERNAL_PADDING);
   int pre_label_width =
       GetBubbleOuterPadding(true) + (image_width ? (image_width + padding) : 0);
   label_->SetBounds(pre_label_width, 0,
                     width() - pre_label_width - GetBubbleOuterPadding(false),
                     height());
 }
 
@@ skipping 36 matching lines @@
 const char* IconLabelBubbleView::GetClassName() const {
   return "IconLabelBubbleView";
 }
 
 void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
   if (!ShouldShowBackground())
     return;
   if (background_painter_)
     background_painter_->Paint(canvas, size());
 }