ui/display/chromeos/x11/native_display_delegate_x11.cc - Issue 1878903002: Use injection and remove ozone dependency from ui/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: ui/display/chromeos/x11/native_display_delegate_x11.cc

Issue 1878903002: Use injection and remove ozone dependency from ui/display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix unique_ptr Created 4 years, 8 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: ui/display/chromeos/x11/native_display_delegate_x11.cc

diff --git a/ui/display/chromeos/x11/native_display_delegate_x11.cc b/ui/display/chromeos/x11/native_display_delegate_x11.cc

index 2dc16a638c5017b7533bab5be694a4ee0415f615..f0d7f01f3de586559576e33f2a390b3e3ae6d908 100644

--- a/ui/display/chromeos/x11/native_display_delegate_x11.cc

+++ b/ui/display/chromeos/x11/native_display_delegate_x11.cc

@@ -109,7 +109,8 @@ NativeDisplayDelegateX11::NativeDisplayDelegateX11()

background_color_argb_(0) {}

NativeDisplayDelegateX11::~NativeDisplayDelegateX11() {

- if (ui::PlatformEventSource::GetInstance()) {

+ if (ui::PlatformEventSource::GetInstance() &&

+ platform_event_dispatcher_.get()) {

ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(

platform_event_dispatcher_.get());

}

« no previous file with comments | « ui/display/chromeos/x11/display_configurator_x11.cc ('k') | ui/display/display.gyp » ('j') | no next file with comments »