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

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

Issue 12473004: src/: Update the remaining include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/x/events_x.cc ('k') | ui/gfx/font_list.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 (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/font_fallback_win.h" 5 #include "ui/gfx/font_fallback_win.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "base/string_split.h"
11 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "base/strings/string_split.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "base/win/registry.h" 13 #include "base/win/registry.h"
14 #include "ui/gfx/font.h" 14 #include "ui/gfx/font.h"
15 15
16 namespace gfx { 16 namespace gfx {
17 17
18 namespace { 18 namespace {
19 19
20 // Queries the registry to get a mapping from font filenames to font names. 20 // Queries the registry to get a mapping from font filenames to font names.
21 void QueryFontsFromRegistry(std::map<std::string, std::string>* map) { 21 void QueryFontsFromRegistry(std::map<std::string, std::string>* map) {
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 // Note: One possibility would be to always merge both lists of fonts, 234 // Note: One possibility would be to always merge both lists of fonts,
235 // but it is not clear whether there are any real world scenarios 235 // but it is not clear whether there are any real world scenarios
236 // where this would actually help. 236 // where this would actually help.
237 if (fonts->empty()) 237 if (fonts->empty())
238 fonts = font_link->GetLinkedFonts(current_font_); 238 fonts = font_link->GetLinkedFonts(current_font_);
239 239
240 return fonts; 240 return fonts;
241 } 241 }
242 242
243 } // namespace gfx 243 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/base/x/events_x.cc ('k') | ui/gfx/font_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698