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

chrome/browser/chromeos/login/rounded_rect_painter.cc

 // Copyright (c) 2010 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/chromeos/login/rounded_rect_painter.h"
 
-#include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
+#include "gfx/canvas.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "views/border.h"
 #include "views/painter.h"
 
 namespace chromeos {
 
 namespace {
 
 const int kBackgroundPadding = 10;
@@ skipping 203 matching lines @@
 
 views::Painter* CreateWizardPainter(const BorderDefinition* const border) {
   return new RoundedRectPainter(border);
 }
 
 views::Border* CreateWizardBorder(const BorderDefinition* const border) {
   return new RoundedRectBorder(border);
 }
 
 }  // namespace chromeos