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

app/resource_bundle.cc

 // Copyright (c) 2006-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/resource_bundle.h"
 
-#include "app/gfx/font.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "gfx/codec/png_codec.h"
+#include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
 
 /* static */
 // TODO(glen): Finish moving these into theme provider (dialogs still
 //    depend on these colors).
 const SkColor ResourceBundle::frame_color =
      SkColorSetRGB(77, 139, 217);
 const SkColor ResourceBundle::frame_color_inactive =
@@ skipping 152 matching lines @@
     case MediumFont:
       return *medium_font_;
     case MediumBoldFont:
       return *medium_bold_font_;
     case LargeFont:
       return *large_font_;
     default:
       return *base_font_;
   }
 }