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

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

Issue 11416251: Desktop aura: Continue threading context through views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix erroneously removed line from NWWin tests. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/focus/focus_manager_unittest.cc ('k') | ui/views/test/views_test_base.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 (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 #ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ 5 #ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_
6 #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ 6 #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 26 matching lines...) Expand all
37 37
38 protected: 38 protected:
39 TestViewsDelegate& views_delegate() const { return *views_delegate_.get(); } 39 TestViewsDelegate& views_delegate() const { return *views_delegate_.get(); }
40 40
41 void set_views_delegate(TestViewsDelegate* views_delegate) { 41 void set_views_delegate(TestViewsDelegate* views_delegate) {
42 views_delegate_.reset(views_delegate); 42 views_delegate_.reset(views_delegate);
43 } 43 }
44 44
45 MessageLoop* message_loop() { return &message_loop_; } 45 MessageLoop* message_loop() { return &message_loop_; }
46 46
47 // Creates a widget of |type| with any platform specific data for use in
48 // cross-platform tests. Will also set WIDGET_OWNS_NATIVE_WIDGET, which most
49 // unit tests want.
50 Widget::InitParams CreateParams(Widget::InitParams::Type type);
51
47 private: 52 private:
48 MessageLoopForUI message_loop_; 53 MessageLoopForUI message_loop_;
49 scoped_ptr<TestViewsDelegate> views_delegate_; 54 scoped_ptr<TestViewsDelegate> views_delegate_;
50 #if defined(USE_AURA) 55 #if defined(USE_AURA)
51 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; 56 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
52 #endif 57 #endif
53 bool setup_called_; 58 bool setup_called_;
54 bool teardown_called_; 59 bool teardown_called_;
55 60
56 #if defined(OS_WIN) 61 #if defined(OS_WIN)
57 ui::ScopedOleInitializer ole_initializer_; 62 ui::ScopedOleInitializer ole_initializer_;
58 #endif 63 #endif
59 64
60 DISALLOW_COPY_AND_ASSIGN(ViewsTestBase); 65 DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);
61 }; 66 };
62 67
63 } // namespace views 68 } // namespace views
64 69
65 #endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ 70 #endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ui/views/focus/focus_manager_unittest.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698