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

Unified Diff: content/common/font_list_android.cc

Issue 23978005: Fix build breakage on chrome-for-tv (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 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
Index: content/common/font_list_android.cc
diff --git a/content/browser/loader/resource_handler.cc b/content/common/font_list_android.cc
similarity index 57%
copy from content/browser/loader/resource_handler.cc
copy to content/common/font_list_android.cc
index 2a5d85ee253c26d4cecdee1ad576b47874115171..c296657244358a67576465c2da597c3326ce039d 100644
--- a/content/browser/loader/resource_handler.cc
+++ b/content/common/font_list_android.cc
@@ -2,12 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/loader/resource_handler.h"
+#include "content/common/font_list.h"
+
+#include "base/values.h"
namespace content {
-void ResourceHandler::SetController(ResourceController* controller) {
- controller_ = controller;
+scoped_ptr<ListValue> GetFontList_SlowBlocking() {
+ return scoped_ptr<ListValue>(new ListValue);
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698