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

chrome/common/extensions/extension_action.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/common/extensions/extension_action.h"
 
 #include <algorithm>
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "gfx/canvas.h"
+#include "gfx/font.h"
 #include "gfx/rect.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 
 namespace {
 
 // Different platforms need slightly different constants to look good.
 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
@@ skipping 159 matching lines @@
   // text was too large.
   rect.fLeft += kPadding;
   rect.fRight -= kPadding;
   canvas->clipRect(rect);
   canvas->drawText(text.c_str(), text.size(),
                    rect.fLeft + (rect.width() - text_width) / 2,
                    rect.fTop + kTextSize + kTopTextPadding,
                    *text_paint);
   canvas->restore();
 }