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

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

Issue 1543183002: Switch to standard integer types in ui/gfx/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
« no previous file with comments | « ui/gfx/font_fallback_win_unittest.cc ('k') | ui/gfx/font_list_unittest.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/font_list_impl.h" 5 #include "ui/gfx/font_list_impl.h"
6 6
7 #include <stddef.h>
8
7 #include <algorithm> 9 #include <algorithm>
8 10
9 #include "base/logging.h" 11 #include "base/logging.h"
10 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
12 #include "ui/gfx/font.h" 14 #include "ui/gfx/font.h"
13 #include "ui/gfx/font_list.h" 15 #include "ui/gfx/font_list.h"
14 16
15 namespace { 17 namespace {
16 18
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 font_style_ = fonts_[0].GetStyle(); 192 font_style_ = fonts_[0].GetStyle();
191 font_size_ = fonts_[0].GetFontSize(); 193 font_size_ = fonts_[0].GetFontSize();
192 } else { 194 } else {
193 std::vector<std::string> font_names; 195 std::vector<std::string> font_names;
194 CHECK(FontList::ParseDescription(font_description_string_, &font_names, 196 CHECK(FontList::ParseDescription(font_description_string_, &font_names,
195 &font_style_, &font_size_)); 197 &font_style_, &font_size_));
196 } 198 }
197 } 199 }
198 200
199 } // namespace gfx 201 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/font_fallback_win_unittest.cc ('k') | ui/gfx/font_list_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698