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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/views_test_helper_aura.h
diff --git a/ui/views/test/views_test_helper_aura.h b/ui/views/test/views_test_helper_aura.h
index 1d6227a39de186b61a72471b2159c005935fbecc..b94bc365ceda32e91a73c1e1f3218c36d13037aa 100644
--- a/ui/views/test/views_test_helper_aura.h
+++ b/ui/views/test/views_test_helper_aura.h
@@ -28,7 +28,8 @@ namespace views {
class ViewsTestHelperAura : public ViewsTestHelper {
public:
- explicit ViewsTestHelperAura(base::MessageLoopForUI* message_loop);
+ ViewsTestHelperAura(base::MessageLoopForUI* message_loop,
+ ui::ContextFactory* context_factory);
virtual ~ViewsTestHelperAura();
// Overridden from ViewsTestHelper:
@@ -37,6 +38,7 @@ class ViewsTestHelperAura : public ViewsTestHelper {
virtual gfx::NativeView GetContext() OVERRIDE;
private:
+ ui::ContextFactory* context_factory_;
scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
scoped_ptr<wm::WMState> wm_state_;
« 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