Set font size to 14 in location bar 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 183 matching lines @@
   }
 
   location_icon_view_ = new LocationIconView(this);
   location_icon_view_->set_drag_controller(this);
   AddChildView(location_icon_view_);
 
   // Determine the main font.
   gfx::FontList font_list = ResourceBundle::GetSharedInstance().GetFontList(
       ResourceBundle::BaseFont);
   const int current_font_size = font_list.GetFontSize();
-  const int desired_font_size = browser_defaults::kOmniboxFontPixelSize;

[Peter Kasting, 2015/08/21 17:14:35]

Please remove the declaration and definition of this constant.

[tdanderson, 2015/08/21 18:17:24]

Done.

+  const int desired_font_size = GetThemeProvider()->GetDisplayProperty(
+      ThemeProperties::PROPERTY_OMNIBOX_FONT_PIXEL_SIZE);
   if (current_font_size != desired_font_size) {
     font_list =
         font_list.DeriveWithSizeDelta(desired_font_size - current_font_size);
   }
   // Shrink large fonts to make them fit.
   // TODO(pkasting): Stretch the location bar instead in this case.
-  const int location_height = GetInternalHeight(true);
+  const int location_height = ui::MaterialDesignController::IsModeMaterial() ?
+      GetThemeProvider()->GetDisplayProperty(
+          ThemeProperties::PROPERTY_LOCATION_BAR_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_padding = GetThemeProvider()->GetDisplayProperty(
       ThemeProperties::PROPERTY_LOCATION_BAR_BUBBLE_VERTICAL_PADDING);
   const int bubble_vertical_padding =
       (bubble_padding + kBubbleInteriorVerticalPadding) * 2;
   const gfx::FontList bubble_font_list(font_list.DeriveWithHeightUpperBound(
       location_height - bubble_vertical_padding));

[jonross, 2015/08/21 14:44:13]

Do we intend to have the bubble font also refer to different heights in MD?

 
   const SkColor background_color =
       GetColor(connection_security::NONE, LocationBarView::BACKGROUND);
   ev_bubble_view_ = new EVBubbleView(
       bubble_font_list, GetColor(connection_security::EV_SECURE, SECURITY_TEXT),
       background_color, this);
   ev_bubble_view_->set_drag_controller(this);
   AddChildView(ev_bubble_view_);
 
   // Initialize the Omnibox view.
@@ skipping 1176 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();
   }
 }