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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mandoline/ui/aura/aura_init.cc

Issue 1406523003: Makes example use TYPE_WINDOW (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | « mandoline/ui/aura/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/aura/aura_init.cc
diff --git a/mandoline/ui/aura/aura_init.cc b/mandoline/ui/aura/aura_init.cc
index c3890255b263f5e4103d186f8c4a38a557d3af92..b51dc9ea4ffe2762034ca1cdaee0a267517c5cbd 100644
--- a/mandoline/ui/aura/aura_init.cc
+++ b/mandoline/ui/aura/aura_init.cc
@@ -70,9 +70,12 @@ void AuraInit::InitializeResources(mojo::Shell* shell) {
resource_loader.GetICUFile().TakePlatformFile(),
base::MemoryMappedFile::Region::kWholeFile);
ui::RegisterPathProvider();
- ui::ResourceBundle::InitSharedInstanceWithPakPath(base::FilePath());
+ base::File pak_file = resource_loader.ReleaseFile(resource_file_);
+ base::File pak_file_2 = pak_file.Duplicate();
+ ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
+ pak_file.Pass(), base::MemoryMappedFile::Region::kWholeFile);
ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
- resource_loader.ReleaseFile(resource_file_), ui::SCALE_FACTOR_100P);
+ pak_file_2.Pass(), ui::SCALE_FACTOR_100P);
// Initialize the skia font code to go ask fontconfig underneath.
#if defined(OS_LINUX) && !defined(OS_ANDROID)
« no previous file with comments | « mandoline/ui/aura/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698