Remove unnecessary font list creation in AppListItemView.

ui/app_list/views/app_list_item_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 "ui/app_list/views/app_list_item_view.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 23 matching lines @@
 #include "ui/views/drag_controller.h"
 
 namespace app_list {
 
 namespace {
 
 const int kTopPadding = 20;
 const int kIconTitleSpacing = 7;
 const int kProgressBarHorizontalPadding = 12;
 
-// The font is different on each platform. The font size is adjusted on some
-// platforms to keep a consistent look.
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-// Reducing the font size by 2 makes it the same as the Windows font size.
-const int kFontSizeDelta = -2;
-#else
-const int kFontSizeDelta = 0;
-#endif
-
 // Radius of the folder dropping preview circle.
 const int kFolderPreviewRadius = 40;
 
 const int kLeftRightPaddingChars = 1;
 
 // Scale to transform the icon when a drag starts.
 const float kDraggingIconScale = 1.5f;
 
 // Delay in milliseconds of when the dragging UI should be shown for mouse drag.
 const int kMouseDragUIDelayInMs = 200;
@@ skipping 25 matching lines @@
       ui_state_(UI_STATE_NORMAL),
       touch_dragging_(false),
       is_installing_(false),
       is_highlighted_(false) {
   icon_->set_interactive(false);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   title_->SetBackgroundColor(0);
   title_->SetAutoColorReadabilityEnabled(false);
   title_->SetEnabledColor(kGridTitleColor);
-  title_->SetFontList(
-      rb.GetFontList(kItemTextFontStyle).DeriveWithSizeDelta(kFontSizeDelta));
+
+  const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle);
+// The font is different on each platform. The font size is adjusted on some
+// platforms to keep a consistent look.
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  // Reducing the font size by 2 makes it the same as the Windows font size.
+  const int kFontSizeDelta = -2;
+  font_list = font_list.DeriveWithSizeDelta(kFontSizeDelta);

[tapted, 2014/09/18 01:56:45]

assigning to a const reference? pretty sure that shouldn't work :p

+#endif
+  title_->SetFontList(font_list);

[tapted, 2014/09/18 01:56:45]

nit: I think I liked the #ifdefs being just around the constant... what about

  const gfx::FontList& font_list = rb.GetFontList(kItemTextFontStyle);
  title_->SetFontList(kFontSizeDelta == 0 ?
      font_list : font_list.DeriveWithSizeDelta(kFontSizeDelta));

   title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_->Invalidate();
   SetTitleSubpixelAA();
 
   AddChildView(icon_);
   AddChildView(title_);
   AddChildView(progress_bar_);
 
   SetIcon(item->icon(), item->has_shadow());
   SetItemName(base::UTF8ToUTF16(item->GetDisplayName()),
@@ skipping 440 matching lines @@
   SetItemPercentDownloaded(item_weak_->percent_downloaded());
 }
 
 void AppListItemView::ItemBeingDestroyed() {
   DCHECK(item_weak_);
   item_weak_->RemoveObserver(this);
   item_weak_ = NULL;
 }
 
 }  // namespace app_list