ui/display/chromeos/display_configurator.cc - Issue 508303002: Move touchscreen device caching to DeviceDataManager

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

Issue 508303002: Move touchscreen device caching to DeviceDataManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove PlatformEventObserver Created 6 years, 3 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

« no previous file with comments | « ui/display/chromeos/display_configurator.h ('k') | ui/display/chromeos/ozone/display_configurator_ozone.cc » ('j') | ui/display/chromeos/touchscreen_delegate_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/display/chromeos/display_configurator.cc

diff --git a/ui/display/chromeos/display_configurator.cc b/ui/display/chromeos/display_configurator.cc

index f25f05a94342de085e130ac3da5429019c067406..65c54021f8dac5d8690ad5a99811a5f31b6123da 100644

--- a/ui/display/chromeos/display_configurator.cc

+++ b/ui/display/chromeos/display_configurator.cc

@@ -11,6 +11,7 @@

#include "base/strings/stringprintf.h"

#include "base/sys_info.h"

#include "base/time/time.h"

+#include "ui/display/chromeos/touchscreen_delegate_impl.h"

#include "ui/display/display_switches.h"

#include "ui/display/types/chromeos/display_mode.h"

#include "ui/display/types/chromeos/display_snapshot.h"

@@ -199,7 +200,7 @@ void DisplayConfigurator::Init(bool is_panel_fitting_enabled) {

}

if (!touchscreen_delegate_)

- touchscreen_delegate_ = CreatePlatformTouchscreenDelegate();

+ touchscreen_delegate_.reset(new TouchscreenDelegateImpl());

}

void DisplayConfigurator::ForceInitialConfigure(