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/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 20 matching lines @@
     image_->SetImage(
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             contained_image));
   }
 
   // Disable separate hit testing for |image_|.  This prevents views treating
   // |image_| as a separate mouse hover region from |this|.
   image_->set_interactive(false);
   AddChildView(image_);
 
+  if (ui::MaterialDesignController::IsModeMaterial())
+    label_->SetAutoColorReadabilityEnabled(false);

[Peter Kasting, 2015/10/01 01:12:17]

You shouldn't need to do this; if you do something is likely wrong with the
colors you're using (maybe because the spec is wrong).

[jonross, 2015/10/01 15:46:50]

Yeah it is rejecting White text on all three background colors.

   label_->SetEnabledColor(text_color);
 
   if (elide_in_middle)
     label_->SetElideBehavior(gfx::ELIDE_MIDDLE);
   AddChildView(label_);
 }
 
 IconLabelBubbleView::~IconLabelBubbleView() {
 }
 
@@ skipping 35 matching lines @@
   return 1.0;
 }
 
 gfx::Size IconLabelBubbleView::GetPreferredSize() const {
   // 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 image_x = std::min((width() - image_width) / 2,
+                               GetBubbleOuterPadding(!is_extension_icon_));
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    const int image_height = image()->GetPreferredSize().height();
+    const int image_veritcal_padding = (height() - image_height) / 2;

[Peter Kasting, 2015/10/01 01:12:17]

Nit: vertical -- but I'd probably just inline this into the next statement.

That is, if this is necessary.  It surprises me that you need this conditional
at all; image objects should auto-vertically-center themselves within the
available space.  If that's not happening here I'd like to understand why.

+    image_->SetBounds(image_x, image_veritcal_padding, image_width,
+                      image_height);
+  } else {
+    image_->SetBounds(image_x, 0, image_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());
 }