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

views/border.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 "views/border.h"
 
-#include "app/gfx/canvas.h"
 #include "base/logging.h"
+#include "gfx/canvas.h"
 
 namespace views {
 
 namespace {
 
 // A simple border with a fixed thickness and single color.
 class SolidBorder : public Border {
  public:
   SolidBorder(int thickness, SkColor color);
 
@@ skipping 78 matching lines @@
 Border* Border::CreateSolidBorder(int thickness, SkColor color) {
   return new SolidBorder(thickness, color);
 }
 
 // static
 Border* Border::CreateEmptyBorder(int top, int left, int bottom, int right) {
   return new EmptyBorder(top, left, bottom, right);
 }
 
 }  // namespace views