ash/sysui/sysui_application.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: ash/sysui/sysui_application.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:

Index: ash/sysui/sysui_application.cc

diff --git a/ash/sysui/sysui_application.cc b/ash/sysui/sysui_application.cc

index 1c8788389000c044e0b7a96507f3f006fe279d7b..bbe85ca1bd0f3422a30152f5e615ec8e6062d6e1 100644

--- a/ash/sysui/sysui_application.cc

+++ b/ash/sysui/sysui_application.cc

@@ -30,11 +30,11 @@

#include "base/files/file_path.h"

#include "base/path_service.h"

#include "base/threading/sequenced_worker_pool.h"

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

-#include "components/mus/public/cpp/property_type_converters.h"

-#include "components/mus/public/interfaces/input_devices/input_device_server.mojom.h"

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

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

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

+#include "services/ui/public/cpp/property_type_converters.h"

+#include "services/ui/public/interfaces/input_devices/input_device_server.mojom.h"

#include "ui/aura/env.h"

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

#include "ui/base/ui_base_paths.h"

« no previous file with comments | « ash/sysui/sysui_application.h ('k') | chrome/app/mash/BUILD.gn » ('j') | no next file with comments »