diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-03 01:12:01 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-03 01:12:01 +0000 |
| commit | 1523b746ecd2e88357deb710e891011cb55db9ab (patch) | |
| tree | 53a2ebc33931352e0078fa164748453df199281b /ui/aura | |
| parent | 21965e2a68ffb2d4107492e8f739e4391dbe7f38 (diff) | |
| download | chromium_src-1523b746ecd2e88357deb710e891011cb55db9ab.zip chromium_src-1523b746ecd2e88357deb710e891011cb55db9ab.tar.gz chromium_src-1523b746ecd2e88357deb710e891011cb55db9ab.tar.bz2 | |
Mac Aura fails compile and some tests
Fixes compile errors and marks failing tests as FAILED to get
bots green. Will tackle proper fixes to tests in follow-on CLs.
BUG=None
TEST=ShellTest.FAILS_OverlappingWindowModeBasics, CompactLayoutManagerTest.FAILS_TransitionTest, RootWindowEventFilterTest.FAILS_TransformActivate, ToplevelWindowEventFilterTest.FAILS_EscapeReverts
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9585028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
| -rw-r--r-- | ui/aura/env.h | 2 | ||||
| -rw-r--r-- | ui/aura/gestures/gesture_point.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/aura/env.h b/ui/aura/env.h index daf5b742..34f4c01 100644 --- a/ui/aura/env.h +++ b/ui/aura/env.h @@ -17,12 +17,12 @@ namespace aura { class EnvObserver; class Window; +#if !defined(OS_MACOSX) class Dispatcher : public MessageLoop::Dispatcher { public: virtual ~Dispatcher() {} }; -#if !defined(OS_MACOSX) // Creates a platform-specific native event dispatcher. Dispatcher* CreateDispatcher(); #endif diff --git a/ui/aura/gestures/gesture_point.h b/ui/aura/gestures/gesture_point.h index 906ba48..9c3d951 100644 --- a/ui/aura/gestures/gesture_point.h +++ b/ui/aura/gestures/gesture_point.h @@ -60,9 +60,9 @@ class GesturePoint { // A negative point_id indicates that the GesturePoint is not currently // associated with a touch. void set_point_id(int point_id) { point_id_ = point_id; } - const int point_id() const { return point_id_; } + int point_id() const { return point_id_; } - const bool in_use() const { return point_id_ >= 0; } + bool in_use() const { return point_id_ >= 0; } double x_delta() const { return last_touch_position_.x() - first_touch_position_.x(); |