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

gfx/canvas_linux.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 "app/gfx/canvas.h"
+#include "gfx/canvas.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
 
-#include "app/gfx/font.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/font.h"
 #include "gfx/rect.h"
 
 namespace {
 
 const gunichar kAcceleratorChar = '&';
 
 // Font settings that we initialize once and then use when drawing text in
 // DrawStringInt().
 static cairo_font_options_t* cairo_font_options = NULL;
 
@@ skipping 247 matching lines @@
     NOTREACHED();
     return;
   }
 
   cairo_t* cr = beginPlatformPaint();
   gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
   cairo_paint(cr);
 }
 
 }  // namespace gfx