services/ui/mus_app.cc - Issue 2119963002: Move mus to //services/ui

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: services/ui/mus_app.cc

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 6 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

Index: services/ui/mus_app.cc

diff --git a/components/mus/mus_app.cc b/services/ui/mus_app.cc

similarity index 93%

rename from components/mus/mus_app.cc

rename to services/ui/mus_app.cc

index 8ec1901a0c6a4ef0ce862befda8bc01a69013d94..874bf09a7684e6129bcb2fab25d4edfd5849face 100644

--- a/components/mus/mus_app.cc

+++ b/services/ui/mus_app.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "components/mus/mus_app.h"

+#include "services/ui/mus_app.h"

#include <set>

@@ -12,28 +12,28 @@

#include "base/memory/weak_ptr.h"

#include "base/threading/platform_thread.h"

#include "build/build_config.h"

-#include "components/mus/clipboard/clipboard_impl.h"

-#include "components/mus/common/switches.h"

-#include "components/mus/gles2/gpu_impl.h"

-#include "components/mus/gpu/gpu_service_impl.h"

-#include "components/mus/gpu/gpu_service_mus.h"

-#include "components/mus/ws/display.h"

-#include "components/mus/ws/display_binding.h"

-#include "components/mus/ws/display_manager.h"

-#include "components/mus/ws/platform_screen.h"

-#include "components/mus/ws/user_activity_monitor.h"

-#include "components/mus/ws/user_display_manager.h"

-#include "components/mus/ws/window_server.h"

-#include "components/mus/ws/window_server_test_impl.h"

-#include "components/mus/ws/window_tree.h"

-#include "components/mus/ws/window_tree_binding.h"

-#include "components/mus/ws/window_tree_factory.h"

-#include "components/mus/ws/window_tree_host_factory.h"

#include "mojo/public/c/system/main.h"

#include "services/catalog/public/cpp/resource_loader.h"

#include "services/shell/public/cpp/connection.h"

#include "services/shell/public/cpp/connector.h"

#include "services/tracing/public/cpp/tracing_impl.h"

+#include "services/ui/clipboard/clipboard_impl.h"

+#include "services/ui/common/switches.h"

+#include "services/ui/gles2/gpu_impl.h"

+#include "services/ui/gpu/gpu_service_impl.h"

+#include "services/ui/gpu/gpu_service_mus.h"

+#include "services/ui/ws/display.h"

+#include "services/ui/ws/display_binding.h"

+#include "services/ui/ws/display_manager.h"

+#include "services/ui/ws/platform_screen.h"

+#include "services/ui/ws/user_activity_monitor.h"

+#include "services/ui/ws/user_display_manager.h"

+#include "services/ui/ws/window_server.h"

+#include "services/ui/ws/window_server_test_impl.h"

+#include "services/ui/ws/window_tree.h"

+#include "services/ui/ws/window_tree_binding.h"

+#include "services/ui/ws/window_tree_factory.h"

+#include "services/ui/ws/window_tree_host_factory.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_paths.h"

#include "ui/events/event_switches.h"

« no previous file with comments | « services/ui/mus_app.h ('k') | services/ui/public/cpp/BUILD.gn » ('j') | no next file with comments »