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

Unified Diff: ui/views/test/views_test_base.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/examples/content_client/examples_browser_main_parts.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/views_test_base.h
diff --git a/ui/views/test/views_test_base.h b/ui/views/test/views_test_base.h
index f689ea085381b387142c8dd35ae605ba3864c1b0..58a74fdf5bd9ec42a55ec141d7c28430dee9da26 100644
--- a/ui/views/test/views_test_base.h
+++ b/ui/views/test/views_test_base.h
@@ -14,6 +14,10 @@
#include "ui/base/win/scoped_ole_initializer.h"
#endif
+namespace ui {
+class ContextFactory;
+}
+
namespace views {
class ViewsTestHelper;
@@ -35,6 +39,8 @@ class ViewsTestBase : public testing::Test {
// cross-platform tests.
Widget::InitParams CreateParams(Widget::InitParams::Type type);
+ ui::ContextFactory* context_factory() { return context_factory_; }
+
protected:
TestViewsDelegate& views_delegate() const { return *views_delegate_.get(); }
@@ -49,6 +55,7 @@ class ViewsTestBase : public testing::Test {
gfx::NativeView GetContext();
private:
+ ui::ContextFactory* context_factory_;
base::MessageLoopForUI message_loop_;
scoped_ptr<TestViewsDelegate> views_delegate_;
scoped_ptr<ViewsTestHelper> test_helper_;
« no previous file with comments | « ui/views/examples/content_client/examples_browser_main_parts.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698