Commit 16d87b59 authored by sadrul@chromium.org's avatar sadrul@chromium.org

Fix build failure from bad merge.

TBR=ben@chromium.org
BUG=none

Review URL: https://chromiumcodereview.appspot.com/10826237

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150923 0039d316-1c4b-4281-b951-d872f2087c98
parent 51827b32
......@@ -241,18 +241,6 @@ class UI_EXPORT TouchEvent : public LocatedEvent {
void set_force(float force) { force_ = force; }
protected:
void set_radius(float radius_x, float radius_y) {
radius_x_ = radius_x;
radius_y_ = radius_y;
}
void set_rotation_angle(float rotation_angle) {
rotation_angle_ = rotation_angle;
}
void set_force(float force) { force_ = force; }
private:
// The identity (typically finger) of the touch starting at 0 and incrementing
// for each separable additional touch that the hardware can detect.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment