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

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

Issue 1980283002: Revert of mus: Add views_mus_interactive_ui_tests target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « ui/views/test/platform_test_helper.cc ('k') | ui/views/test/scoped_views_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_SCOPED_VIEWS_TEST_HELPER_H_ 5 #ifndef UI_VIEWS_TEST_SCOPED_VIEWS_TEST_HELPER_H_
6 #define UI_VIEWS_TEST_SCOPED_VIEWS_TEST_HELPER_H_ 6 #define UI_VIEWS_TEST_SCOPED_VIEWS_TEST_HELPER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 21 matching lines...) Expand all
32 std::unique_ptr<TestViewsDelegate> views_delegate); 32 std::unique_ptr<TestViewsDelegate> views_delegate);
33 33
34 ~ScopedViewsTestHelper(); 34 ~ScopedViewsTestHelper();
35 35
36 // Returns the context for creating new windows. In Aura builds, this will be 36 // Returns the context for creating new windows. In Aura builds, this will be
37 // the RootWindow. Everywhere else, null. 37 // the RootWindow. Everywhere else, null.
38 gfx::NativeWindow GetContext(); 38 gfx::NativeWindow GetContext();
39 39
40 TestViewsDelegate* views_delegate() { return views_delegate_.get(); }; 40 TestViewsDelegate* views_delegate() { return views_delegate_.get(); };
41 41
42 bool IsMus() const;
43
42 private: 44 private:
43 std::unique_ptr<TestViewsDelegate> views_delegate_; 45 std::unique_ptr<TestViewsDelegate> views_delegate_;
44 std::unique_ptr<ViewsTestHelper> test_helper_; 46 std::unique_ptr<ViewsTestHelper> test_helper_;
45 std::unique_ptr<PlatformTestHelper> platform_test_helper_; 47 std::unique_ptr<PlatformTestHelper> platform_test_helper_;
46 48
47 DISALLOW_COPY_AND_ASSIGN(ScopedViewsTestHelper); 49 DISALLOW_COPY_AND_ASSIGN(ScopedViewsTestHelper);
48 }; 50 };
49 51
50 } // namespace views 52 } // namespace views
51 53
52 #endif // UI_VIEWS_TEST_SCOPED_VIEWS_TEST_HELPER_H_ 54 #endif // UI_VIEWS_TEST_SCOPED_VIEWS_TEST_HELPER_H_
OLDNEW
« no previous file with comments | « ui/views/test/platform_test_helper.cc ('k') | ui/views/test/scoped_views_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698