Commit 35b0cd22 authored by sky's avatar sky Committed by Commit bot

Makes window manager include ui pak file

We'll need this for cursors and shadows.

BUG=548426
TEST=none
R=erg@chromium.org

Review URL: https://codereview.chromium.org/1466483003

Cr-Commit-Position: refs/heads/master@{#361162}
parent ffad6ad1
......@@ -34,11 +34,18 @@ if (is_android) {
deps = [
":lib",
"//mojo/application/public/cpp:sources",
"//ui/resources",
]
if (is_win) {
deps += [ ":copy_gl_libraries" ]
}
resources = [ "$root_gen_dir/ui/resources/ui_resources_100_percent.pak" ]
data_deps = [
"//ui/resources",
]
}
}
......@@ -75,9 +82,11 @@ source_set("lib") {
"//components/mus/public/interfaces",
"//components/mus/surfaces",
"//components/mus/ws:lib",
"//components/resource_provider/public/cpp",
"//mojo/application/public/cpp",
"//mojo/common:common_base",
"//mojo/services/tracing/public/cpp",
"//ui/base",
"//ui/events",
"//ui/gl:gl",
"//ui/platform_window:platform_impls",
......
include_rules = [
"+cc",
"+components/gpu",
"+components/resource_provider",
"+mojo/application",
"+mojo/common",
"+mojo/converters",
......
......@@ -4,6 +4,7 @@
#include "components/mus/mus_app.h"
#include "base/path_service.h"
#include "base/stl_util.h"
#include "components/mus/common/args.h"
#include "components/mus/gles2/gpu_impl.h"
......@@ -14,11 +15,14 @@
#include "components/mus/ws/window_tree_host_connection.h"
#include "components/mus/ws/window_tree_host_impl.h"
#include "components/mus/ws/window_tree_impl.h"
#include "components/resource_provider/public/cpp/resource_loader.h"
#include "mojo/application/public/cpp/application_connection.h"
#include "mojo/application/public/cpp/application_impl.h"
#include "mojo/application/public/cpp/application_runner.h"
#include "mojo/public/c/system/main.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/events/event_switches.h"
#include "ui/events/platform/platform_event_source.h"
#include "ui/gl/gl_surface.h"
......@@ -36,6 +40,26 @@ using mus::mojom::WindowTreeHostFactory;
using mus::mojom::Gpu;
namespace mus {
namespace {
void InitResources(ApplicationImpl* app) {
const std::string resource_file = "ui_resources_100_percent.pak";
std::set<std::string> paths;
paths.insert(resource_file);
resource_provider::ResourceLoader resource_loader(app, paths);
CHECK(resource_loader.BlockUntilLoaded());
CHECK(resource_loader.loaded());
ui::RegisterPathProvider();
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(
pak_file_2.Pass(), ui::SCALE_FACTOR_100P);
}
} // namespace
MandolineUIServicesApp::MandolineUIServicesApp()
: app_impl_(nullptr) {}
......@@ -48,6 +72,8 @@ MandolineUIServicesApp::~MandolineUIServicesApp() {
}
void MandolineUIServicesApp::Initialize(ApplicationImpl* app) {
InitResources(app);
app_impl_ = app;
surfaces_state_ = new SurfacesState;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment