Commit 70c88376 authored by sky's avatar sky Committed by Commit bot

Revert of Makes window manager include ui pak file (patchset #1 id:1 of...

Revert of Makes window manager include ui pak file (patchset #1 id:1 of https://codereview.chromium.org/1466483003/ )

Reason for revert:
I'm reverting this and will instead include it in the wm.

Original issue's description:
> Makes window manager include ui pak file
>
> We'll need this for cursors and shadows.
>
> BUG=548426
> TEST=none
> R=erg@chromium.org
>
> Committed: https://crrev.com/35b0cd220fd2a788c16055b756e8483936b0e384
> Cr-Commit-Position: refs/heads/master@{#361162}

TBR=erg@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=548426

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

Cr-Commit-Position: refs/heads/master@{#361225}
parent feffc2f4
...@@ -18,11 +18,11 @@ if (is_android) { ...@@ -18,11 +18,11 @@ if (is_android) {
deps = [ deps = [
":lib", ":lib",
"public/interfaces",
"//mojo/application/public/cpp:sources", "//mojo/application/public/cpp:sources",
"//mojo/public/cpp/bindings", "//mojo/public/cpp/bindings",
"//mojo/services/tracing/public/interfaces", "//mojo/services/tracing/public/interfaces",
"//mojo/shell", "//mojo/shell",
"public/interfaces",
] ]
} }
} else { } else {
...@@ -34,18 +34,11 @@ if (is_android) { ...@@ -34,18 +34,11 @@ if (is_android) {
deps = [ deps = [
":lib", ":lib",
"//mojo/application/public/cpp:sources", "//mojo/application/public/cpp:sources",
"//ui/resources",
] ]
if (is_win) { if (is_win) {
deps += [ ":copy_gl_libraries" ] deps += [ ":copy_gl_libraries" ]
} }
resources = [ "$root_gen_dir/ui/resources/ui_resources_100_percent.pak" ]
data_deps = [
"//ui/resources",
]
} }
} }
...@@ -82,11 +75,9 @@ source_set("lib") { ...@@ -82,11 +75,9 @@ source_set("lib") {
"//components/mus/public/interfaces", "//components/mus/public/interfaces",
"//components/mus/surfaces", "//components/mus/surfaces",
"//components/mus/ws:lib", "//components/mus/ws:lib",
"//components/resource_provider/public/cpp",
"//mojo/application/public/cpp", "//mojo/application/public/cpp",
"//mojo/common:common_base", "//mojo/common:common_base",
"//mojo/services/tracing/public/cpp", "//mojo/services/tracing/public/cpp",
"//ui/base",
"//ui/events", "//ui/events",
"//ui/gl:gl", "//ui/gl:gl",
"//ui/platform_window:platform_impls", "//ui/platform_window:platform_impls",
......
include_rules = [ include_rules = [
"+cc", "+cc",
"+components/gpu", "+components/gpu",
"+components/resource_provider",
"+mojo/application", "+mojo/application",
"+mojo/common", "+mojo/common",
"+mojo/converters", "+mojo/converters",
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include "components/mus/mus_app.h" #include "components/mus/mus_app.h"
#include "base/path_service.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "components/mus/common/args.h" #include "components/mus/common/args.h"
#include "components/mus/gles2/gpu_impl.h" #include "components/mus/gles2/gpu_impl.h"
...@@ -15,14 +14,11 @@ ...@@ -15,14 +14,11 @@
#include "components/mus/ws/window_tree_host_connection.h" #include "components/mus/ws/window_tree_host_connection.h"
#include "components/mus/ws/window_tree_host_impl.h" #include "components/mus/ws/window_tree_host_impl.h"
#include "components/mus/ws/window_tree_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_connection.h"
#include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_impl.h"
#include "mojo/application/public/cpp/application_runner.h" #include "mojo/application/public/cpp/application_runner.h"
#include "mojo/public/c/system/main.h" #include "mojo/public/c/system/main.h"
#include "mojo/services/tracing/public/cpp/tracing_impl.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/event_switches.h"
#include "ui/events/platform/platform_event_source.h" #include "ui/events/platform/platform_event_source.h"
#include "ui/gl/gl_surface.h" #include "ui/gl/gl_surface.h"
...@@ -40,26 +36,6 @@ using mus::mojom::WindowTreeHostFactory; ...@@ -40,26 +36,6 @@ using mus::mojom::WindowTreeHostFactory;
using mus::mojom::Gpu; using mus::mojom::Gpu;
namespace mus { 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() MandolineUIServicesApp::MandolineUIServicesApp()
: app_impl_(nullptr) {} : app_impl_(nullptr) {}
...@@ -72,8 +48,6 @@ MandolineUIServicesApp::~MandolineUIServicesApp() { ...@@ -72,8 +48,6 @@ MandolineUIServicesApp::~MandolineUIServicesApp() {
} }
void MandolineUIServicesApp::Initialize(ApplicationImpl* app) { void MandolineUIServicesApp::Initialize(ApplicationImpl* app) {
InitResources(app);
app_impl_ = app; app_impl_ = app;
surfaces_state_ = new SurfacesState; 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