Update omnibox chips in MD

chrome/browser/ui/views/location_bar/icon_label_bubble_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 11 matching lines @@
 
 namespace views {
 class ImageView;
 class Label;
 class Painter;
 }
 
 // View used to draw a bubble, containing an icon and a label. We use this as a
 // base for the classes that handle the location icon (including the EV bubble),
 // tab-to-search UI, and content settings.
 class IconLabelBubbleView : public views::InkDropHostView {

[Evan Stade, 2016/05/19 21:20:45]

Bubble is no longer the best terminology, but I'll defer changing that till MD
is the D.

[Evan Stade, 2016/05/19 21:24:49]

this was supposed to be "...is the only D"

  public:
   IconLabelBubbleView(int contained_image,
                       const gfx::FontList& font_list,
                       SkColor parent_background_color,
                       bool elide_in_middle);
   ~IconLabelBubbleView() override;
 
   // Sets a background that paints |background_images| in a scalable grid.
   // Subclasses must call this during construction.
   void SetBackgroundImageGrid(const int background_images[]);
@@ skipping 73 matching lines @@
   const char* GetClassName() const override;
   void OnPaint(gfx::Canvas* canvas) override;
 
   // For painting the background. TODO(estade): remove post MD launch.
   std::unique_ptr<views::Painter> background_painter_;
 
   // The contents of the bubble.
   views::ImageView* image_;
   views::Label* label_;
 
-  // How much horizontal padding (fully-transparent columns) is inside the
-  // image.  These are subtracted from the desired padding values when
-  // calculating the padding around the image, so that the image always appears
-  // to have the same visible padding no matter what its composition is.  Only
-  // used in MD.
-  int builtin_leading_padding_;
-  int builtin_trailing_padding_;

[Evan Stade, 2016/05/19 21:20:45]

I believe this is no longer necessary given that the new icon set should all
have the same internal padding.

-
   bool is_extension_icon_;
 
   // This is only used in pre-MD. In MD, the background color is derived from
   // the native theme (so it responds to native theme updates). TODO(estade):
   // remove when MD is default.
   SkColor parent_background_color_;
 
   bool should_show_background_;
 
   DISALLOW_COPY_AND_ASSIGN(IconLabelBubbleView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_