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

views/controls/label.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_LABEL_H_
 #define VIEWS_CONTROLS_LABEL_H_
 
-#include "app/gfx/font.h"
+#include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "views/view.h"
 
 namespace views {
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Label class
@@ skipping 236 matching lines @@
   // allows this view to reserve space for a focus border that it otherwise
   // might not have because it is not itself focusable.
   bool has_focus_border_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_LABEL_H_