ash/mus/root_window_controller.cc - Issue 2161993002: Start using display.mojom.Display in mus+ash.

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 2161993002: Start using display.mojom.Display in mus+ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@display_traits

Patch Set: Fixes. Created 4 years, 5 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: ash/mus/root_window_controller.cc

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

index d861d487a689e5340c75b39c51a9677f14a94532..ea935decc0f38a6554e01b58394a4eb59cd536fc 100644

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

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

@@ -9,6 +9,9 @@

#include <algorithm>

#include <map>

#include <sstream>

+#include <string>

+#include <utility>

+#include <vector>

#include "ash/common/root_window_controller_common.h"

#include "ash/common/shell_window_ids.h"

@@ -42,7 +45,6 @@

#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/BUILD.gn ('k') | services/ui/public/cpp/BUILD.gn » ('j') | no next file with comments »