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

Unified Diff: chrome/browser/ui/webui/options2/font_settings_handler2.cc

Issue 9500008: Move font_list_async.h to content/public. Switch to Pass() goodness to simplify code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix clang Created 8 years, 10 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 | « chrome/browser/ui/webui/options2/font_settings_handler2.h ('k') | content/browser/font_list_async.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options2/font_settings_handler2.cc
===================================================================
--- chrome/browser/ui/webui/options2/font_settings_handler2.cc (revision 124079)
+++ chrome/browser/ui/webui/options2/font_settings_handler2.cc (working copy)
@@ -20,6 +20,7 @@
#include "chrome/browser/ui/webui/options2/font_settings_utils2.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
+#include "content/public/browser/font_list_async.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/web_ui.h"
#include "grit/chromium_strings.h"
@@ -108,7 +109,7 @@
}
void FontSettingsHandler::FontsListHasLoaded(
- scoped_refptr<content::FontListResult> list) {
+ scoped_ptr<base::ListValue> list) {
ListValue encoding_list;
const std::vector<CharacterEncoding::EncodingInfo>* encodings;
PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
@@ -146,7 +147,7 @@
selected_values.Append(Value::CreateStringValue(font_encoding_.GetValue()));
web_ui()->CallJavascriptFunction("FontSettings.setFontsData",
- *list->list.get(), encoding_list,
+ *list.get(), encoding_list,
selected_values);
}
« no previous file with comments | « chrome/browser/ui/webui/options2/font_settings_handler2.h ('k') | content/browser/font_list_async.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698