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

Unified Diff: content/common/font_list_linux.cc

Issue 15102010: untangle pango usage from use_x11 and OS==linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove stray unit test inclusion (bad rebase?) Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | content/common/font_list_pango.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/font_list_linux.cc
diff --git a/content/common/font_list_linux.cc b/content/common/font_list_linux.cc
deleted file mode 100644
index 7a67b3cb67bf1e294922518b94ed45c2af9c00f5..0000000000000000000000000000000000000000
--- a/content/common/font_list_linux.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2011 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 "content/common/font_list.h"
-
-#include <pango/pango.h>
-#include <pango/pangocairo.h>
-
-#include <set>
-#include <string>
-
-#include "base/values.h"
-
-namespace content {
-
-scoped_ptr<base::ListValue> GetFontList_SlowBlocking() {
- scoped_ptr<base::ListValue> font_list(new base::ListValue);
-
- PangoFontMap* font_map = ::pango_cairo_font_map_get_default();
- PangoFontFamily** families = NULL;
- int num_families = 0;
- ::pango_font_map_list_families(font_map, &families, &num_families);
-
- std::set<std::string> sorted_families;
- for (int i = 0; i < num_families; i++) {
- sorted_families.insert(::pango_font_family_get_name(families[i]));
- }
- g_free(families);
-
- for (std::set<std::string>::const_iterator iter = sorted_families.begin();
- iter != sorted_families.end(); ++iter) {
- base::ListValue* font_item = new base::ListValue();
- font_item->Append(new base::StringValue(*iter));
- font_item->Append(new base::StringValue(*iter)); // localized name.
- // TODO(yusukes): Support localized family names.
- font_list->Append(font_item);
- }
-
- return font_list.Pass();
-}
-
-} // namespace content
« no previous file with comments | « build/common.gypi ('k') | content/common/font_list_pango.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698