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

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

index 3a3ea6a4edcc58e79f55814265f8e3f7d03aa17a..f853cc76ff80b61ffa096b231b0787c59299629b 100644

--- a/ash/mus/root_window_controller.cc

+++ b/ash/mus/root_window_controller.cc

@@ -32,15 +32,15 @@

#include "base/bind.h"

#include "base/command_line.h"

#include "base/memory/ptr_util.h"

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

-#include "components/mus/common/util.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 "components/mus/public/cpp/window_tree_host_factory.h"

#include "mojo/public/cpp/bindings/type_converter.h"

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

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

+#include "services/ui/common/util.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 "services/ui/public/cpp/window_tree_host_factory.h"

#include "ui/display/mojo/display_type_converters.h"

using ash::mojom::Container;

« no previous file with comments | « ash/mus/root_window_controller.h ('k') | ash/mus/screenlock_layout.cc » ('j') | no next file with comments »