ash/mus/bridge/wm_shell_mus.h - Issue 2270553002: Move ash::DisplayInfo 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: ash/mus/bridge/wm_shell_mus.h

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased Created 4 years, 4 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/bridge/wm_shell_mus.h

diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h

index 29b2d23e2599fb8ccea88f4bf012e0f0cb1c6960..a75f86a51eee83b28e88d328f150d5605763e553 100644

--- a/ash/mus/bridge/wm_shell_mus.h

+++ b/ash/mus/bridge/wm_shell_mus.h

@@ -67,7 +67,7 @@ class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {

WmWindow* GetCaptureWindow() override;

WmWindow* GetPrimaryRootWindow() override;

WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;

- const DisplayInfo& GetDisplayInfo(int64_t display_id) const override;

+ const ui::DisplayInfo& GetDisplayInfo(int64_t display_id) const override;

bool IsActiveDisplayId(int64_t display_id) const override;

display::Display GetFirstDisplay() const override;

bool IsInUnifiedMode() const override;