chrome/browser/browser_shutdown.cc - Issue 6975045: touch: Always expect XInput2 availability.

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/browser_shutdown.cc

Issue 6975045: touch: Always expect XInput2 availability. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 9 years, 5 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: chrome/browser/browser_shutdown.cc

diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc

index e359a64066461a5bac9681b01ad57da192e7f636..8bee29e4e59e5e0681537268f124da470968851c 100644

--- a/chrome/browser/browser_shutdown.cc

+++ b/chrome/browser/browser_shutdown.cc

@@ -132,13 +132,10 @@ void Shutdown() {

// Singletons are finally destroyed in AtExitManager.

chromeos::SystemKeyEventListener::GetInstance()->Stop();

- // TODO(yusukes): Remove the #if once the ARM bot (crbug.com/84694) is fixed.

-#if defined(HAVE_XINPUT2)

// The XInput2 event listener needs to be shut down earlier than when

// Singletons are finally destroyed in AtExitManager.

chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();

#endif

-#endif

// WARNING: During logoff/shutdown (WM_ENDSESSION) we may not have enough

// time to get here. If you have something that *must* happen on end session,

« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/chromeos/frame/panel_controller.cc » ('j') | no next file with comments »