Update Location Bar Bubbles Layout for Material Design

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

Index: chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
index ed09f59f1616ebb12ab6dd6e5a0d9b8c75f9f557..4364bad16ed4cb6980d62226afa3cdc3995db2e2 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -6,6 +6,7 @@
 
 #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"

[Peter Kasting, 2015/10/05 21:53:13]

Nit: This is no longer needed

[jonross, 2015/10/06 18:00:13]

Done.

 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
@@ -45,7 +46,6 @@ IconLabelBubbleView::IconLabelBubbleView(int contained_image,
   // |image_| as a separate mouse hover region from |this|.
   image_->set_interactive(false);
   AddChildView(image_);
-

[Peter Kasting, 2015/10/05 21:53:13]

Nit: Don't remove this

[jonross, 2015/10/06 18:00:13]

Done.

   label_->SetEnabledColor(text_color);
 
   if (elide_in_middle)
@@ -105,7 +105,7 @@ void IconLabelBubbleView::Layout() {
                              GetBubbleOuterPadding(!is_extension_icon_)),
                     0, image_->GetPreferredSize().width(), height());
 
-  const int padding = GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
+  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,
@@ -117,7 +117,7 @@ gfx::Size IconLabelBubbleView::GetSizeForLabelWidth(int width) const {
   gfx::Size size(image_->GetPreferredSize());
   if (ShouldShowBackground()) {
     const int image_width = image_->GetPreferredSize().width();
-    const int padding = GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
+    const int padding = GetLayoutConstant(ICON_LABEL_VIEW_INTERNAL_PADDING);
     const int non_label_width =
         GetBubbleOuterPadding(true) +
         (image_width ? (image_width + padding) : 0) +