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

gfx/font_skia.cc

 // Copyright (c) 2006-2008 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 "app/gfx/font.h"
+#include "gfx/font.h"
 
 #include <gdk/gdk.h>
 #include <map>
 #include <pango/pango.h>
 
-#include "app/gfx/canvas.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "base/sys_string_conversions.h"
+#include "gfx/canvas.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/core/SkPaint.h"
 
 namespace {
 
 // The font family name which is used when a user's application font for
 // GNOME/KDE is a non-scalable one. The name should be listed in the
 // IsFallbackFontAllowed function in skia/ext/SkFontHost_fontconfig_direct.cpp.
 const char* kFallbackFontFamilyName = "sans";
 
@@ skipping 243 matching lines @@
 
 int Font::FontSize() {
   return font_size_;
 }
 
 NativeFont Font::nativeFont() const {
   return typeface_;
 }
 
 }  // namespace gfx