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

Side by Side Diff: ui/aura/window_unittest.cc

Issue 630003003: Change GestureConfiguration types to be consistent with each other and with the (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/aura/window.h" 5 #include "ui/aura/window.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 set_max_separation_for_gesture_touches_in_pixels(0); 64 set_max_separation_for_gesture_touches_in_pixels(0);
65 } 65 }
66 66
67 virtual void TearDown() OVERRIDE { 67 virtual void TearDown() OVERRIDE {
68 AuraTestBase::TearDown(); 68 AuraTestBase::TearDown();
69 ui::GestureConfiguration:: 69 ui::GestureConfiguration::
70 set_max_separation_for_gesture_touches_in_pixels(max_separation_); 70 set_max_separation_for_gesture_touches_in_pixels(max_separation_);
71 } 71 }
72 72
73 private: 73 private:
74 int max_separation_; 74 float max_separation_;
75 75
76 DISALLOW_COPY_AND_ASSIGN(WindowTest); 76 DISALLOW_COPY_AND_ASSIGN(WindowTest);
77 }; 77 };
78 78
79 namespace { 79 namespace {
80 80
81 // Used for verifying destruction methods are invoked. 81 // Used for verifying destruction methods are invoked.
82 class DestroyTrackingDelegateImpl : public TestWindowDelegate { 82 class DestroyTrackingDelegateImpl : public TestWindowDelegate {
83 public: 83 public:
84 DestroyTrackingDelegateImpl() 84 DestroyTrackingDelegateImpl()
(...skipping 3389 matching lines...) Expand 10 before | Expand all | Expand 10 after
3474 3474
3475 EXPECT_TRUE(animator.get()); 3475 EXPECT_TRUE(animator.get());
3476 EXPECT_FALSE(animator->is_animating()); 3476 EXPECT_FALSE(animator->is_animating());
3477 EXPECT_TRUE(observer.animation_completed()); 3477 EXPECT_TRUE(observer.animation_completed());
3478 EXPECT_FALSE(observer.animation_aborted()); 3478 EXPECT_FALSE(observer.animation_aborted());
3479 animator->RemoveObserver(&observer); 3479 animator->RemoveObserver(&observer);
3480 } 3480 }
3481 3481
3482 } // namespace test 3482 } // namespace test
3483 } // namespace aura 3483 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698