diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 14:43:09 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 14:43:09 +0000 |
| commit | a7db8814c792c3fda0352dd4a9c41b4a9ab50edf (patch) | |
| tree | 448424236ae3c8438fe30d4d8f2a88ba812d6eea /ui/gfx/platform_font_pango.cc | |
| parent | ee3c4292071b451c40eeb4f0fe876411e0058eea (diff) | |
| download | chromium_src-a7db8814c792c3fda0352dd4a9c41b4a9ab50edf.zip chromium_src-a7db8814c792c3fda0352dd4a9c41b4a9ab50edf.tar.gz chromium_src-a7db8814c792c3fda0352dd4a9c41b4a9ab50edf.tar.bz2 | |
ui/gfx: Update includes to point to canvas.h instead of canvas_skia.h
BUG=116572
R=asvitkine@chromium.org
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9702009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/platform_font_pango.cc')
| -rw-r--r-- | ui/gfx/platform_font_pango.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/gfx/platform_font_pango.cc b/ui/gfx/platform_font_pango.cc index 5fb031c..f0ed5e4 100644 --- a/ui/gfx/platform_font_pango.cc +++ b/ui/gfx/platform_font_pango.cc @@ -4,10 +4,11 @@ #include "ui/gfx/platform_font_pango.h" -#include <algorithm> #include <fontconfig/fontconfig.h> -#include <map> #include <pango/pango.h> + +#include <algorithm> +#include <map> #include <string> #include "base/logging.h" @@ -15,10 +16,10 @@ #include "base/string_split.h" #include "base/utf_string_conversions.h" #include "grit/app_locale_settings.h" -#include "third_party/skia/include/core/SkTypeface.h" #include "third_party/skia/include/core/SkPaint.h" +#include "third_party/skia/include/core/SkTypeface.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/gfx/canvas_skia.h" +#include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/pango_util.h" |