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

Unified Diff: components/mus/mus_app.cc

Issue 1874703003: Load ash_sysui resources with ResourceLoader. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 8 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 | « components/mus/android_loader.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/mus_app.cc
diff --git a/components/mus/mus_app.cc b/components/mus/mus_app.cc
index de56eaf43ed4069b7f3f6a6e2e492db9a4a3dd15..a40c741ae62ea41f632b2bcfaabf4bc77a058f3d 100644
--- a/components/mus/mus_app.cc
+++ b/components/mus/mus_app.cc
@@ -89,20 +89,20 @@ void MandolineUIServicesApp::InitializeResources(mojo::Connector* connector) {
resource_paths.insert(kResourceFile100);
resource_paths.insert(kResourceFile200);
- resource_provider::ResourceLoader resource_loader(connector, resource_paths);
- if (!resource_loader.BlockUntilLoaded())
+ resource_provider::ResourceLoader loader(connector, resource_paths);
+ if (!loader.BlockUntilLoaded())
return;
- CHECK(resource_loader.loaded());
ui::RegisterPathProvider();
// Initialize resource bundle with 1x and 2x cursor bitmaps.
ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
- resource_loader.ReleaseFile(kResourceFileStrings),
+ loader.ReleaseFile(kResourceFileStrings),
base::MemoryMappedFile::Region::kWholeFile);
- ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
- resource_loader.ReleaseFile(kResourceFile100), ui::SCALE_FACTOR_100P);
- ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
- resource_loader.ReleaseFile(kResourceFile200), ui::SCALE_FACTOR_200P);
+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+ rb.AddDataPackFromFile(loader.ReleaseFile(kResourceFile100),
+ ui::SCALE_FACTOR_100P);
+ rb.AddDataPackFromFile(loader.ReleaseFile(kResourceFile200),
+ ui::SCALE_FACTOR_200P);
}
MandolineUIServicesApp::UserState* MandolineUIServicesApp::GetUserState(
« no previous file with comments | « components/mus/android_loader.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698