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

chrome/browser/chromeos/panels/panel_scroller_header.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 "chrome/browser/chromeos/panels/panel_scroller_header.h"
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/panels/panel_scroller.h"
+#include "gfx/canvas.h"
+#include "gfx/font.h"
 
 PanelScrollerHeader::PanelScrollerHeader(PanelScroller* scroller)
     : views::View(),
       scroller_(scroller) {
 }
 
 PanelScrollerHeader::~PanelScrollerHeader() {
 }
 
 bool PanelScrollerHeader::OnMousePressed(const views::MouseEvent& event) {
@@ skipping 19 matching lines @@
   canvas->DrawLineInt(0xFFE6E6E6, 0, size().height() - 1,
                       size().width(), size().height() - 1);
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gfx::Font font =
       rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);
   int font_top = 1;
   canvas->DrawStringInt(UTF16ToWideHack(title_), font, 0xFF000000, 3, font_top,
                         size().width(), size().height() - font_top);
 }