services/ui/ws/server_window_surface_manager.cc - Issue 2386763002: services/ui: Match naming in cc (and jellyfish branch)

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: services/ui/ws/server_window_surface_manager.cc

Issue 2386763002: services/ui: Match naming in cc (and jellyfish branch) (Closed)

Patch Set: Removed bad change 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:

Index: services/ui/ws/server_window_surface_manager.cc

diff --git a/services/ui/ws/server_window_surface_manager.cc b/services/ui/ws/server_window_surface_manager.cc

index 0bb6277aee68c82f68ce37f93dd7a0eebe830245..7386a8fde892f1076256145405a7231fd4f62c1d 100644

--- a/services/ui/ws/server_window_surface_manager.cc

+++ b/services/ui/ws/server_window_surface_manager.cc

@@ -4,7 +4,7 @@

#include "services/ui/ws/server_window_surface_manager.h"

-#include "services/ui/surfaces/surfaces_state.h"

+#include "services/ui/surfaces/display_compositor.h"

#include "services/ui/ws/server_window.h"

#include "services/ui/ws/server_window_delegate.h"

#include "services/ui/ws/server_window_surface.h"

@@ -68,7 +68,7 @@ bool ServerWindowSurfaceManager::HasAnySurface() const {

}

cc::SurfaceManager* ServerWindowSurfaceManager::GetSurfaceManager() {

- return window()->delegate()->GetSurfacesState()->manager();

+ return window()->delegate()->GetDisplayCompositor()->manager();

}

bool ServerWindowSurfaceManager::IsSurfaceReadyAndNonEmpty(