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

Unified Diff: content/browser/renderer_host/pepper_message_filter.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 | « content/browser/renderer_host/pepper_message_filter.h ('k') | content/common/font_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/pepper_message_filter.cc
===================================================================
--- content/browser/renderer_host/pepper_message_filter.cc (revision 124079)
+++ content/browser/renderer_host/pepper_message_filter.cc (working copy)
@@ -13,7 +13,6 @@
#include "base/process_util.h"
#include "base/threading/worker_pool.h"
#include "base/values.h"
-#include "content/browser/font_list_async.h"
#include "content/browser/renderer_host/pepper_tcp_server_socket.h"
#include "content/browser/renderer_host/pepper_tcp_socket.h"
#include "content/browser/renderer_host/pepper_udp_socket.h"
@@ -22,6 +21,7 @@
#include "content/common/pepper_messages.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/font_list_async.h"
#include "content/public/browser/resource_context.h"
#include "content/public/browser/site_instance.h"
#include "content/public/common/content_client.h"
@@ -648,13 +648,11 @@
void PepperMessageFilter::GetFontFamiliesComplete(
IPC::Message* reply_msg,
- scoped_refptr<content::FontListResult> result) {
- ListValue* input = result->list.get();
-
+ scoped_ptr<base::ListValue> result) {
std::string output;
- for (size_t i = 0; i < input->GetSize(); i++) {
- ListValue* cur_font;
- if (!input->GetList(i, &cur_font))
+ for (size_t i = 0; i < result->GetSize(); i++) {
+ base::ListValue* cur_font;
+ if (!result->GetList(i, &cur_font))
continue;
// Each entry in the list is actually a list of (font name, localized name).
« no previous file with comments | « content/browser/renderer_host/pepper_message_filter.h ('k') | content/common/font_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698