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

Unified Diff: ui/aura/test/aura_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/aura/remote_window_tree_host_win.cc ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_base.h
diff --git a/ui/aura/test/aura_test_base.h b/ui/aura/test/aura_test_base.h
index b9f6e7f68ce309907e9f0571264e7fe43834817d..93f54fbafb47eca1ad1ac97f1700b07a7dc07227 100644
--- a/ui/aura/test/aura_test_base.h
+++ b/ui/aura/test/aura_test_base.h
@@ -11,6 +11,10 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/aura/test/aura_test_helper.h"
+namespace ui {
+class ContextFactory;
+}
+
namespace aura {
class Window;
class WindowDelegate;
@@ -31,6 +35,8 @@ class AuraTestBase : public testing::Test {
aura::Window* CreateNormalWindow(int id, Window* parent,
aura::WindowDelegate* delegate);
+ ui::ContextFactory* context_factory() { return context_factory_; }
+
protected:
void RunAllPendingInMessageLoop();
@@ -48,6 +54,7 @@ class AuraTestBase : public testing::Test {
private:
bool setup_called_;
bool teardown_called_;
+ ui::ContextFactory* context_factory_;
base::MessageLoopForUI message_loop_;
scoped_ptr<AuraTestHelper> helper_;
« no previous file with comments | « ui/aura/remote_window_tree_host_win.cc ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698