mash/wm/root_window_controller.cc - Issue 1965073002: Rename gfx::Display to display::Display

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: mash/wm/root_window_controller.cc

Issue 1965073002: Rename gfx::Display to display::Display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 7 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: mash/wm/root_window_controller.cc

diff --git a/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc

index aa3b661a79f0830a3d00aca101f554083492254c..c0ec5b7135d845482a90642e138d0ed17e63f722 100644

--- a/mash/wm/root_window_controller.cc

+++ b/mash/wm/root_window_controller.cc

@@ -47,7 +47,7 @@ RootWindowController* RootWindowController::CreateFromDisplay(

mus::mojom::DisplayPtr display,

mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) {

RootWindowController* controller = new RootWindowController(app);

- controller->display_ = display.To<gfx::Display>();

+ controller->display_ = display.To<display::Display>();

mus::WindowTreeConnection::CreateForWindowManager(

controller, std::move(client_request),

mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED,