chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2445583002: Relocate display_manager from ash to 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: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

Issue 2445583002: Relocate display_manager from ash to ui (Closed)

Patch Set: fix windows build Created 4 years, 2 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

« no previous file with comments | « chrome/browser/signin/easy_unlock_service_regular.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

index bcebcc77bd085e32acf49f00dc375103e891c4ba..e5815f08d4562948d935dae40b13a770c9d4870a 100644

--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

@@ -12,7 +12,6 @@

#include "ash/common/wm_lookup.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window_property.h"

-#include "ash/display/display_manager.h"

#include "ash/display/screen_orientation_controller_chromeos.h"

#include "ash/shared/app_types.h"

#include "ash/shell.h"

@@ -35,6 +34,7 @@

#include "ui/aura/env.h"

#include "ui/base/base_window.h"

#include "ui/display/display.h"

+#include "ui/display/manager/display_manager.h"

#include "ui/views/widget/widget.h"

namespace {