| 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..54f621ac4a6b2b4dae62757b4039a0f3c29ef4d9 100644
|
| --- a/ui/views/mus/aura_init.cc
|
| +++ b/ui/views/mus/aura_init.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "ui/views/mus/aura_init.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/lazy_instance.h"
|
| #include "base/path_service.h"
|
| #include "components/resource_provider/public/cpp/resource_loader.h"
|
| @@ -80,9 +82,9 @@ void AuraInit::InitializeResources(mojo::ApplicationImpl* app) {
|
| 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);
|
| + std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile);
|
| ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
|
| - pak_file_2.Pass(), ui::SCALE_FACTOR_100P);
|
| + std::move(pak_file_2), ui::SCALE_FACTOR_100P);
|
|
|
| // Initialize the skia font code to go ask fontconfig underneath.
|
| #if defined(OS_LINUX) && !defined(OS_ANDROID)
|
|
|