Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: ui/gfx/platform_font_pango.cc

Issue 14272007: Update the remaining include paths of base/string_piece.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/resource/resource_handle.h ('k') | ui/webui/jstemplate_builder.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/platform_font_pango.h" 5 #include "ui/gfx/platform_font_pango.h"
6 6
7 #include <fontconfig/fontconfig.h> 7 #include <fontconfig/fontconfig.h>
8 #include <pango/pango.h> 8 #include <pango/pango.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
11 #include <string> 11 #include <string>
12 12
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/string_piece.h" 14 #include "base/strings/string_piece.h"
15 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "grit/app_locale_settings.h" 17 #include "grit/app_locale_settings.h"
18 #include "third_party/skia/include/core/SkPaint.h" 18 #include "third_party/skia/include/core/SkPaint.h"
19 #include "third_party/skia/include/core/SkTypeface.h" 19 #include "third_party/skia/include/core/SkTypeface.h"
20 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
21 #include "ui/gfx/canvas.h" 21 #include "ui/gfx/canvas.h"
22 #include "ui/gfx/font.h" 22 #include "ui/gfx/font.h"
23 #include "ui/gfx/pango_util.h" 23 #include "ui/gfx/pango_util.h"
24 24
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 return new PlatformFontPango(native_font); 384 return new PlatformFontPango(native_font);
385 } 385 }
386 386
387 // static 387 // static
388 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, 388 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
389 int font_size) { 389 int font_size) {
390 return new PlatformFontPango(font_name, font_size); 390 return new PlatformFontPango(font_name, font_size);
391 } 391 }
392 392
393 } // namespace gfx 393 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/base/resource/resource_handle.h ('k') | ui/webui/jstemplate_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698