Move app/gfx/canvas and app/gfx/font to gfx/.

chrome/browser/gtk/options/fonts_page_gtk.cc

 // Copyright (c) 2009 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/gtk/options/fonts_page_gtk.h"
 
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/font.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // Make a Gtk font name string from a font family name and pixel size.
 std::string MakeFontName(std::wstring family_name, int pixel_size) {
   // The given font might not be available (the default fonts we use are not
   // installed by default on some distros).  So figure out which font we are
   // actually falling back to and display that.  (See crbug.com/31381.)
   std::wstring actual_family_name = gfx::Font::CreateFont(
@@ skipping 172 matching lines @@
   int index = gtk_combo_box_get_active(GTK_COMBO_BOX(combo_box));
   if (index < 0 ||
       static_cast<size_t>(index) >= sorted_encoding_list_.size()) {
     NOTREACHED();
     return;
   }
   default_encoding_.SetValue(
       ASCIIToWide(CharacterEncoding::GetCanonicalEncodingNameByCommandId(
           sorted_encoding_list_[index].encoding_id)));
 }