chrome/browser/ui/webui/options/font_settings_handler.cc - Issue 9500008: Move font_list_async.h to content/public. Switch to Pass() goodness to simplify code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/font_settings_handler.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/options/font_settings_handler.h ('k') | chrome/browser/ui/webui/options2/font_settings_handler2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/font_settings_handler.cc

===================================================================

--- chrome/browser/ui/webui/options/font_settings_handler.cc (revision 124079)

+++ chrome/browser/ui/webui/options/font_settings_handler.cc (working copy)

@@ -20,6 +20,7 @@

#include "chrome/browser/ui/webui/options/font_settings_utils.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"

@@ -106,7 +107,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();

@@ -144,7 +145,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);

}