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

views/controls/button/text_button.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/controls/button/text_button.h"
 
 #include <algorithm>
 
-#include "app/gfx/canvas.h"
 #include "app/throb_animation.h"
 #include "app/resource_bundle.h"
+#include "gfx/canvas.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"
 #include "grit/app_resources.h"
 
 namespace views {
 
 // Padding between the icon and text.
 static const int kIconTextPadding = 5;
 
 // Preferred padding between text and edge
@@ skipping 368 matching lines @@
 bool TextButton::OnMousePressed(const MouseEvent& e) {
   RequestFocus();
   return true;
 }
 
 void TextButton::Paint(gfx::Canvas* canvas) {
   Paint(canvas, false);
 }
 
 }  // namespace views