Clean-up: Replace Canvas::DrawStringInt with DrawStringRect.

chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.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/gtk/bookmarks/bookmark_utils_gtk.h"
 
 #include "base/pickle.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_strings.h"
 #include "net/base/net_util.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
-#include "ui/gfx/font.h"
+#include "ui/gfx/font_list.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/text_elider.h"
 
 namespace {
 
 // Spacing between the favicon and the text.
 const int kBarButtonPadding = 4;
 
 // Used in gtk_selection_data_set(). (I assume from this parameter that gtk has
 // to some really exotic hardware...)
@@ skipping 104 matching lines @@
   cairo_paint(cr);
   cairo_destroy(cr);
 
   GtkAllocation allocation;
   gtk_widget_get_allocation(sender, &allocation);
 
   // Paint the title text.
   gfx::CanvasSkiaPaint canvas(event, false);
   int text_x = gdk_pixbuf_get_width(data->favicon) + kBarButtonPadding;
   int text_width = allocation.width - text_x;
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  const gfx::Font& base_font = rb.GetFont(ui::ResourceBundle::BaseFont);
-  canvas.DrawStringInt(data->text, base_font, data->text_color,
-                       text_x, 0, text_width, allocation.height,
-                       gfx::Canvas::NO_SUBPIXEL_RENDERING);
+  const gfx::Rect rect(text_x, 0, text_width, allocation.height);
+  canvas.DrawStringRectWithFlags(data->text, gfx::FontList(), data->text_color,
+                                 rect, gfx::Canvas::NO_SUBPIXEL_RENDERING);
 
   return TRUE;
 }
 
 void OnDragIconDestroy(GtkWidget* drag_icon, DragRepresentationData* data) {
   g_object_unref(drag_icon);
   delete data;
 }
 
 }  // namespace
@@ skipping 29 matching lines @@
   if (ui::IsScreenComposited() &&
       gtk_util::AddWindowAlphaChannel(window)) {
     DragRepresentationData* data = new DragRepresentationData(
         pixbuf, title,
         provider->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
     g_signal_connect(window, "expose-event", G_CALLBACK(OnDragIconExpose),
                      data);
     g_object_ref(window);
     g_signal_connect(window, "destroy", G_CALLBACK(OnDragIconDestroy), data);
 
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    const gfx::Font& base_font = rb.GetFont(ui::ResourceBundle::BaseFont);
     gtk_widget_set_size_request(window, kDragRepresentationWidth,
-                                base_font.GetHeight());
+                                gfx::FontList().GetHeight());
   } else {
     if (!provider->UsingNativeTheme()) {
       GdkColor color = provider->GetGdkColor(
           ThemeProperties::COLOR_TOOLBAR);
       gtk_widget_modify_bg(window, GTK_STATE_NORMAL, &color);
     }
     gtk_widget_realize(window);
 
     GtkWidget* frame = gtk_frame_new(NULL);
     gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
@@ skipping 262 matching lines @@
     return net::GetSuggestedFilename(url,
                                      std::string(),
                                      std::string(),
                                      std::string(),
                                      std::string(),
                                      std::string());
   } else {
     return l10n_util::GetStringUTF16(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME);
   }
 }