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

Unified Diff: ui/views/mus/aura_init.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
« no previous file with comments | « mojo/runner/init.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/aura_init.cc
diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc
index e3e4d808bc7fe7f0167ad92453211f15dd21c39a..653c9c377a7def1fdedb4458bb782af2cd6687d8 100644
--- a/ui/views/mus/aura_init.cc
+++ b/ui/views/mus/aura_init.cc
@@ -4,6 +4,7 @@
#include "ui/views/mus/aura_init.h"
+#include "base/i18n/icu_util.h"
#include "base/lazy_instance.h"
#include "base/path_service.h"
#include "components/resource_provider/public/cpp/resource_loader.h"
@@ -76,6 +77,9 @@
if (!resource_loader.BlockUntilLoaded())
return;
CHECK(resource_loader.loaded());
+ base::i18n::InitializeICUWithFileDescriptor(
+ resource_loader.GetICUFile().TakePlatformFile(),
+ base::MemoryMappedFile::Region::kWholeFile);
ui::RegisterPathProvider();
base::File pak_file = resource_loader.ReleaseFile(resource_file_);
base::File pak_file_2 = pak_file.Duplicate();
« no previous file with comments | « mojo/runner/init.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698