Update Location Bar Bubbles Layout for Material Design

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/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ skipping 87 matching lines @@
   // Height will be ignored by the LocationBarView.
   return GetSizeForLabelWidth(label_->GetPreferredSize().width());
 }
 
 void IconLabelBubbleView::Layout() {
   const int image_width = image()->GetPreferredSize().width();
   image_->SetBounds(std::min((width() - image_width) / 2,
                              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,
                     width() - pre_label_width - GetBubbleOuterPadding(false),
                     height());
 }
 
 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) +
         GetBubbleOuterPadding(false);
     size = gfx::Size(WidthMultiplier() * (width + non_label_width), 0);
     size.SetToMax(background_painter_->GetMinimumSize());
   }
 
   return size;
 }
@@ skipping 21 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());
 }