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

views/controls/button/image_button.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 "views/controls/button/image_button.h"
 
-#include "app/gfx/canvas.h"
 #include "app/throb_animation.h"
+#include "gfx/canvas.h"
 #include "gfx/skbitmap_operations.h"
 
 namespace views {
 
 static const int kDefaultWidth = 16;   // Default button width if no theme.
 static const int kDefaultHeight = 14;  // Default button height if no theme.
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImageButton, public:
 
@@ skipping 141 matching lines @@
 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
                                        std::wstring* tooltip) {
   if (!toggled_ || toggled_tooltip_text_.empty())
     return Button::GetTooltipText(p, tooltip);
 
   *tooltip = toggled_tooltip_text_;
   return true;
 }
 
 }  // namespace views