Update Location Bar Bubbles Layout for Material Design

chrome/browser/ui/views/location_bar/location_bar_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/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
@@ skipping 200 matching lines @@
   // TODO(pkasting): Stretch the location bar instead in this case.
   const int location_height = GetInternalHeight(true);
   font_list = font_list.DeriveWithHeightUpperBound(location_height);
 
   // Determine the font for use inside the bubbles.  The bubble background
   // images have 1 px thick edges, which we don't want to overlap.
   const int kBubbleInteriorVerticalPadding = 1;
   const int bubble_vertical_padding =
       (GetLayoutConstant(LOCATION_BAR_BUBBLE_VERTICAL_PADDING) +
           kBubbleInteriorVerticalPadding) * 2;
-  const gfx::FontList bubble_font_list(font_list.DeriveWithHeightUpperBound(
-      location_height - bubble_vertical_padding));
+  const int desired_bubble_font_size =
+      GetLayoutConstant(LOCATION_BAR_BUBBLE_FONT_PIXEL_SIZE);
+  gfx::FontList bubble_font_list = font_list;
+  if (bubble_font_list.GetFontSize() != desired_bubble_font_size) {
+    bubble_font_list = bubble_font_list.DeriveWithSizeDelta(
+        desired_bubble_font_size - bubble_font_list.GetFontSize());
+  }
+  bubble_font_list = bubble_font_list.DeriveWithHeightUpperBound(
+      location_height - bubble_vertical_padding);
 
   const SkColor background_color =
       GetColor(SecurityStateModel::NONE, LocationBarView::BACKGROUND);
-  ev_bubble_view_ = new EVBubbleView(
-      bubble_font_list, GetColor(SecurityStateModel::EV_SECURE, SECURITY_TEXT),
-      background_color, this);
+  const SkColor ev_text_color =
+      GetColor(SecurityStateModel::EV_SECURE,
+               ui::MaterialDesignController::IsModeMaterial() ? BUBBLE_TEXT
+                                                              : SECURITY_TEXT);
+  ev_bubble_view_ =
+      new EVBubbleView(bubble_font_list, ev_text_color, background_color, this);
   ev_bubble_view_->set_drag_controller(this);
   AddChildView(ev_bubble_view_);
 
   // Initialize the Omnibox view.
   omnibox_view_ = new OmniboxViewViews(
       this, profile(), command_updater(), is_popup_mode_, this, font_list);
   omnibox_view_->Init();
   omnibox_view_->SetFocusable(true);
   AddChildView(omnibox_view_);
 
   // Initialize the inline autocomplete view which is visible only when IME is
   // turned on.  Use the same font with the omnibox and highlighted background.
   ime_inline_autocomplete_view_ = new views::Label(base::string16(), font_list);
   ime_inline_autocomplete_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   ime_inline_autocomplete_view_->SetAutoColorReadabilityEnabled(false);
   ime_inline_autocomplete_view_->set_background(
       views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused)));
   ime_inline_autocomplete_view_->SetEnabledColor(
       GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_TextfieldSelectionColor));
   ime_inline_autocomplete_view_->SetVisible(false);
   AddChildView(ime_inline_autocomplete_view_);
 
-  const SkColor text_color = GetColor(SecurityStateModel::NONE, TEXT);
+  const SkColor text_color = GetColor(
+      SecurityStateModel::NONE,
+      ui::MaterialDesignController::IsModeMaterial() ? BUBBLE_TEXT : TEXT);
   selected_keyword_view_ = new SelectedKeywordView(
       bubble_font_list, text_color, background_color, profile());
   AddChildView(selected_keyword_view_);
 
   suggested_text_view_ = new views::Label(base::string16(), font_list);
   suggested_text_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   suggested_text_view_->SetAutoColorReadabilityEnabled(false);
   suggested_text_view_->SetEnabledColor(
       GetColor(SecurityStateModel::NONE, LocationBarView::DEEMPHASIZED_TEXT));
   suggested_text_view_->SetVisible(false);
@@ skipping 100 matching lines @@
           break;
 
         default:
           NOTREACHED();
           return GetColor(security_level, TEXT);
       }
       return color_utils::GetReadableColor(
           color, GetColor(security_level, BACKGROUND));
     }
 
+    case BUBBLE_TEXT:
+      return SK_ColorWHITE;
+
     default:
       NOTREACHED();
       return GetColor(security_level, TEXT);
   }
 }
 
 void LocationBarView::ZoomChangedForActiveTab(bool can_show_bubble) {
   DCHECK(zoom_view_);
   if (RefreshZoomView()) {
     Layout();
@@ skipping 462 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private:
 
 int LocationBarView::IncrementalMinimumWidth(views::View* view) const {
   return view->visible() ?
       (GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING) +
           view->GetMinimumSize().width()) : 0;
 }
 
 int LocationBarView::GetHorizontalEdgeThickness() const {
+  // In Material Design horizontal layout disregards the border.
+  if (ui::MaterialDesignController::IsModeMaterial())
+    return 0;

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

Conceptually it seems like if this is correct, we'd want to change
GetVerticalThickness() instead (which would change this as a side effect).

   // In maximized popup mode, there isn't any edge.
   return (is_popup_mode_ && browser_ && browser_->window() &&
           browser_->window()->IsMaximized()) ?
       0 : GetVerticalEdgeThickness();
 }
 
 int LocationBarView::GetVerticalEdgeThickness() const {
   return is_popup_mode_ ? kPopupEdgeThickness : kNormalEdgeThickness;
 }
 
@@ skipping 543 matching lines @@
 
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }