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

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

Issue 273073002: Changes code using Compositor to pass in ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tooltip on chromeos Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/test/views_test_helper.cc ('k') | ui/views/test/views_test_helper_aura.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 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_AURA_H_ 5 #ifndef UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_
6 #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ 6 #define UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 10 matching lines...) Expand all
21 } 21 }
22 22
23 namespace wm { 23 namespace wm {
24 class WMState; 24 class WMState;
25 } 25 }
26 26
27 namespace views { 27 namespace views {
28 28
29 class ViewsTestHelperAura : public ViewsTestHelper { 29 class ViewsTestHelperAura : public ViewsTestHelper {
30 public: 30 public:
31 explicit ViewsTestHelperAura(base::MessageLoopForUI* message_loop); 31 ViewsTestHelperAura(base::MessageLoopForUI* message_loop,
32 ui::ContextFactory* context_factory);
32 virtual ~ViewsTestHelperAura(); 33 virtual ~ViewsTestHelperAura();
33 34
34 // Overridden from ViewsTestHelper: 35 // Overridden from ViewsTestHelper:
35 virtual void SetUp() OVERRIDE; 36 virtual void SetUp() OVERRIDE;
36 virtual void TearDown() OVERRIDE; 37 virtual void TearDown() OVERRIDE;
37 virtual gfx::NativeView GetContext() OVERRIDE; 38 virtual gfx::NativeView GetContext() OVERRIDE;
38 39
39 private: 40 private:
41 ui::ContextFactory* context_factory_;
40 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; 42 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
41 scoped_ptr<wm::WMState> wm_state_; 43 scoped_ptr<wm::WMState> wm_state_;
42 44
43 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura); 45 DISALLOW_COPY_AND_ASSIGN(ViewsTestHelperAura);
44 }; 46 };
45 47
46 } // namespace views 48 } // namespace views
47 49
48 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_ 50 #endif // UI_VIEWS_TEST_VIEWS_TEST_HELPER_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/test/views_test_helper.cc ('k') | ui/views/test/views_test_helper_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698