ash/mus/user_window_controller_impl.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/mus/user_window_controller_impl.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/mus/user_window_controller_impl.cc

diff --git a/ash/mus/user_window_controller_impl.cc b/ash/mus/user_window_controller_impl.cc

index 0d93eff0b55d49615dfa408d23e1114973dc0ef4..0b86575688001fb8ac766f2d69bc2a9a5634c48b 100644

--- a/ash/mus/user_window_controller_impl.cc

+++ b/ash/mus/user_window_controller_impl.cc

@@ -9,11 +9,11 @@

#include "ash/mus/property_util.h"

#include "ash/mus/root_window_controller.h"

#include "ash/public/interfaces/container.mojom.h"

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

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

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

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

#include "mojo/common/common_type_converters.h"

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

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

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

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

#include "ui/resources/grit/ui_resources.h"

MUS_DECLARE_WINDOW_PROPERTY_TYPE(uint32_t)

« no previous file with comments | « ash/mus/user_window_controller_impl.h ('k') | ash/mus/window_manager.h » ('j') | no next file with comments »