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

Side by Side Diff: ui/views/mus/aura_init.cc

Issue 1942473002: Eliminate mojo:resource_provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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 unified diff | Download patch
« no previous file with comments | « ui/views/mus/DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/mus/aura_init.h" 5 #include "ui/views/mus/aura_init.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "components/resource_provider/public/cpp/resource_loader.h" 13 #include "services/catalog/public/cpp/resource_loader.h"
14 #include "services/shell/public/cpp/connector.h" 14 #include "services/shell/public/cpp/connector.h"
15 #include "ui/aura/env.h" 15 #include "ui/aura/env.h"
16 #include "ui/base/ime/input_method_initializer.h" 16 #include "ui/base/ime/input_method_initializer.h"
17 #include "ui/base/material_design/material_design_controller.h" 17 #include "ui/base/material_design/material_design_controller.h"
18 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
19 #include "ui/base/ui_base_paths.h" 19 #include "ui/base/ui_base_paths.h"
20 #include "ui/views/views_delegate.h" 20 #include "ui/views/views_delegate.h"
21 21
22 #if defined(OS_LINUX) && !defined(OS_ANDROID) 22 #if defined(OS_LINUX) && !defined(OS_ANDROID)
23 #include "components/font_service/public/cpp/font_loader.h" 23 #include "components/font_service/public/cpp/font_loader.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 // thread, otherwise the background thread may be shutdown after the app is 70 // thread, otherwise the background thread may be shutdown after the app is
71 // torn down, when we're in a bad state. 71 // torn down, when we're in a bad state.
72 font_loader_->Shutdown(); 72 font_loader_->Shutdown();
73 } 73 }
74 #endif 74 #endif
75 } 75 }
76 76
77 void AuraInit::InitializeResources(shell::Connector* connector) { 77 void AuraInit::InitializeResources(shell::Connector* connector) {
78 if (ui::ResourceBundle::HasSharedInstance()) 78 if (ui::ResourceBundle::HasSharedInstance())
79 return; 79 return;
80 resource_provider::ResourceLoader resource_loader( 80 catalog::ResourceLoader loader;
81 connector, GetResourcePaths(resource_file_)); 81 filesystem::DirectoryPtr directory;
82 CHECK(resource_loader.BlockUntilLoaded()); 82 connector->ConnectToInterface("mojo:catalog", &directory);
83 CHECK(resource_loader.loaded()); 83 CHECK(loader.OpenFiles(std::move(directory),
84 GetResourcePaths(resource_file_)));
84 ui::RegisterPathProvider(); 85 ui::RegisterPathProvider();
85 base::File pak_file = resource_loader.ReleaseFile(resource_file_); 86 base::File pak_file = loader.TakeFile(resource_file_);
86 base::File pak_file_2 = pak_file.Duplicate(); 87 base::File pak_file_2 = pak_file.Duplicate();
87 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion( 88 ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
88 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile); 89 std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile);
89 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile( 90 ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
90 std::move(pak_file_2), ui::SCALE_FACTOR_100P); 91 std::move(pak_file_2), ui::SCALE_FACTOR_100P);
91 92
92 // Initialize the skia font code to go ask fontconfig underneath. 93 // Initialize the skia font code to go ask fontconfig underneath.
93 #if defined(OS_LINUX) && !defined(OS_ANDROID) 94 #if defined(OS_LINUX) && !defined(OS_ANDROID)
94 font_loader_ = sk_make_sp<font_service::FontLoader>(connector); 95 font_loader_ = sk_make_sp<font_service::FontLoader>(connector);
95 SkFontConfigInterface::SetGlobal(font_loader_.get()); 96 SkFontConfigInterface::SetGlobal(font_loader_.get());
96 #endif 97 #endif
97 98
98 // There is a bunch of static state in gfx::Font, by running this now, 99 // There is a bunch of static state in gfx::Font, by running this now,
99 // before any other apps load, we ensure all the state is set up. 100 // before any other apps load, we ensure all the state is set up.
100 gfx::Font(); 101 gfx::Font();
101 } 102 }
102 103
103 } // namespace views 104 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698