Renames gfx::FontList::Derive* family.

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/command_line.h"
@@ skipping 246 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;
-  if (current_font_size < desired_font_size)
-    font_list = font_list.DeriveFontListWithSize(desired_font_size);

[Alexei Svitkine (slow), 2014/01/20 15:38:10]

Hmm, the left side looks cleaner. Is there a good reason for killing it, rather
than still keeping it as a convenience method?

[Yuki, 2014/01/20 16:43:24]

IMHO, all the fonts should ideally have relative size to the BaseFont in
ui::ResourceBundle.  It's not recommended to specify the absolute size assuming
the default font size would be 14px or so.

In order to discourage specifying the absolute size, I'd like to remove this
method from FontList and Font.

+  if (current_font_size < desired_font_size) {

[msw, 2014/01/21 19:31:12]

nit: this should be !=, to also decrease the font size if needed.

[Yuki, 2014/01/23 15:24:19]

Done.

+    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);
   font_list = GetLargestFontListWithHeightBound(font_list, 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 =
       (kBubblePadding + kBubbleInteriorVerticalPadding) * 2;
@@ skipping 1310 matching lines @@
     bounds.Inset(-(horizontal_padding + 1) / 2, 0);
     location_bar_util::PaintExtensionActionBackground(
         *(*page_action_view)->image_view()->page_action(),
         tab_id, canvas, bounds, text_color, background_color);
   }
 }
 
 void LocationBarView::AccessibilitySetValue(const base::string16& new_value) {
   omnibox_view_->SetUserText(new_value, new_value, true);
 }