chrome/browser/ui/webui/options2/font_settings_handler2.h - 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/options2/font_settings_handler2.h

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

Index: chrome/browser/ui/webui/options2/font_settings_handler2.h

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

--- chrome/browser/ui/webui/options2/font_settings_handler2.h (revision 124079)

+++ chrome/browser/ui/webui/options2/font_settings_handler2.h (working copy)

@@ -6,10 +6,14 @@

#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_FONT_SETTINGS_HANDLER2_H_

#pragma once

+#include "base/memory/scoped_ptr.h"

#include "chrome/browser/prefs/pref_member.h"

#include "chrome/browser/ui/webui/options2/options_ui2.h"

-#include "content/browser/font_list_async.h"

+namespace base {

+class ListValue;

namespace options2 {

// Font settings overlay page UI handler.

@@ -33,7 +37,7 @@

private:

void HandleFetchFontsData(const ListValue* args);

- void FontsListHasLoaded(scoped_refptr<content::FontListResult> list);

+ void FontsListHasLoaded(scoped_ptr<base::ListValue> list);

void SetUpStandardFontSample();

void SetUpSerifFontSample();