Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Unified Diff: ui/display/chromeos/x11/touchscreen_delegate_x11.cc

Issue 226183004: Renamed OutputConfigurator to DisplayConfigurator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/touchscreen_delegate_x11.cc
diff --git a/ui/display/chromeos/x11/touchscreen_delegate_x11.cc b/ui/display/chromeos/x11/touchscreen_delegate_x11.cc
index aba7432b90d875d591e2b5863a45ff2733e9d66e..3e59d88b4a21dc2becf35a1551b088eddb85088a 100644
--- a/ui/display/chromeos/x11/touchscreen_delegate_x11.cc
+++ b/ui/display/chromeos/x11/touchscreen_delegate_x11.cc
@@ -22,7 +22,7 @@ TouchscreenDelegateX11::TouchscreenDelegateX11()
TouchscreenDelegateX11::~TouchscreenDelegateX11() {}
void TouchscreenDelegateX11::AssociateTouchscreens(
- OutputConfigurator::DisplayStateList* outputs) {
+ DisplayConfigurator::DisplayStateList* outputs) {
int ndevices = 0;
Atom valuator_x = XInternAtom(display_, "Abs MT Position X", False);
Atom valuator_y = XInternAtom(display_, "Abs MT Position Y", False);
@@ -74,7 +74,7 @@ void TouchscreenDelegateX11::AssociateTouchscreens(
if (width > 0.0 && height > 0.0 && is_direct_touch) {
size_t k = 0;
for (; k < outputs->size(); k++) {
- OutputConfigurator::DisplayState* output = &(*outputs)[k];
+ DisplayConfigurator::DisplayState* output = &(*outputs)[k];
if (output->touch_device_id != None)
continue;
@@ -131,7 +131,7 @@ void TouchscreenDelegateX11::AssociateTouchscreens(
void TouchscreenDelegateX11::ConfigureCTM(
int touch_device_id,
- const OutputConfigurator::CoordinateTransformation& ctm) {
+ const DisplayConfigurator::CoordinateTransformation& ctm) {
VLOG(1) << "ConfigureCTM: id=" << touch_device_id << " scale=" << ctm.x_scale
<< "x" << ctm.y_scale << " offset=(" << ctm.x_offset << ", "
<< ctm.y_offset << ")";

Powered by Google App Engine
This is Rietveld 408576698