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

Unified Diff: components/resource_provider/public/cpp/resource_loader.cc

Issue 1429263005: Revert of mandoline: Fix ICU initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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: components/resource_provider/public/cpp/resource_loader.cc
diff --git a/components/resource_provider/public/cpp/resource_loader.cc b/components/resource_provider/public/cpp/resource_loader.cc
index 5dd763ffcedab820c58a5e59aa787b484ce46560..8b1c1165612b5f9b610f8d3affcf4abbe9d43e51 100644
--- a/components/resource_provider/public/cpp/resource_loader.cc
+++ b/components/resource_provider/public/cpp/resource_loader.cc
@@ -56,6 +56,15 @@
return file_wrapper->Pass();
}
+base::File ResourceLoader::GetICUFile() {
+ base::File rv;
+ resource_provider_->GetICUHandle(
+ base::Bind(&ResourceLoader::OnGotICU, base::Unretained(this), &rv));
+ resource_provider_.WaitForIncomingResponse();
+ CHECK(rv.IsValid());
+ return rv.Pass();
+}
+
void ResourceLoader::OnGotResources(const std::vector<std::string>& paths,
mojo::Array<mojo::ScopedHandle> resources) {
@@ -68,4 +77,8 @@
loaded_ = true;
}
+void ResourceLoader::OnGotICU(base::File* file, mojo::ScopedHandle handle) {
+ *file = GetFileFromHandle(handle.Pass());
+}
+
} // namespace resource_provider

Powered by Google App Engine
This is Rietveld 408576698