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

Side by Side Diff: ui/views/test/views_test_helper_mac.h

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_MAC_H_ 5 #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_MAC_H_
6 #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_MAC_H_ 6 #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_MAC_H_
7 7
8 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
9 #include "ui/views/test/views_test_helper.h" 10 #include "ui/views/test/views_test_helper.h"
10 11
11 namespace ui { 12 namespace ui {
12 class ScopedAnimationDurationScaleMode; 13 class ScopedAnimationDurationScaleMode;
13 } 14 }
14 15
15 namespace views { 16 namespace views {
16 17
17 class ViewsTestHelperMac : public ViewsTestHelper { 18 class ViewsTestHelperMac : public ViewsTestHelper {
18 public: 19 public:
19 ViewsTestHelperMac(); 20 ViewsTestHelperMac();
20 ~ViewsTestHelperMac() override; 21 ~ViewsTestHelperMac() override;
21 22
22 // ViewsTestHelper: 23 // ViewsTestHelper:
23 void TearDown() override; 24 void TearDown() override;
24 25
25 private: 26 private:
26 // Disable animations during tests. 27 // Disable animations during tests.
27 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_; 28 scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
28 29
29 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperMac); 30 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperMac);
30 }; 31 };
31 32
32 } // namespace views 33 } // namespace views
33 34
34 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_MAC_H_ 35 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698