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

views/controls/textfield/textfield.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_TEXTFIELD_TEXTFIELD_H_
 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 
 #if defined (OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
 #include <string>
 
-#include "app/gfx/font.h"
 #include "base/basictypes.h"
 #include "base/keyboard_codes.h"
 #include "base/string16.h"
+#include "gfx/font.h"
 #include "views/view.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 #ifdef UNIT_TEST
 #include "gfx/native_widget_types.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 #endif
 
 namespace views {
 
@@ skipping 245 matching lines @@
 
   // The storage string for the accessibility name associated with this control.
   std::wstring accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_