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

Unified Diff: ui/aura/window_event_dispatcher_unittest.cc

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/test/test_screen.cc ('k') | ui/aura/window_tree_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_event_dispatcher_unittest.cc
diff --git a/ui/aura/window_event_dispatcher_unittest.cc b/ui/aura/window_event_dispatcher_unittest.cc
index 9c3a77ec15ac8d33d605fc36c8a93d740c2faa69..edb399c4a587092be791fe78e851e236a098442d 100644
--- a/ui/aura/window_event_dispatcher_unittest.cc
+++ b/ui/aura/window_event_dispatcher_unittest.cc
@@ -1441,7 +1441,8 @@ TEST_F(WindowEventDispatcherTest, ValidRootDuringDestruction) {
&has_valid_root);
{
scoped_ptr<WindowTreeHost> host(
- WindowTreeHost::Create(gfx::Rect(0, 0, 100, 100)));
+ WindowTreeHost::Create(gfx::Rect(0, 0, 100, 100),
+ context_factory()));
host->InitHost();
// Owned by WindowEventDispatcher.
Window* w1 = CreateNormalWindow(1, host->window(), NULL);
@@ -1549,7 +1550,8 @@ class DeleteHostFromHeldMouseEventDelegate
// we don't crash.
TEST_F(WindowEventDispatcherTest, DeleteHostFromHeldMouseEvent) {
// Should be deleted by |delegate|.
- WindowTreeHost* h2 = WindowTreeHost::Create(gfx::Rect(0, 0, 100, 100));
+ WindowTreeHost* h2 = WindowTreeHost::Create(gfx::Rect(0, 0, 100, 100),
+ context_factory());
h2->InitHost();
DeleteHostFromHeldMouseEventDelegate delegate(h2);
// Owned by |h2|.
@@ -2019,7 +2021,7 @@ class MoveWindowHandler : public ui::EventHandler {
// event in the inner loop.
TEST_F(WindowEventDispatcherTest, NestedEventDispatchTargetMoved) {
scoped_ptr<WindowTreeHost> second_host(
- WindowTreeHost::Create(gfx::Rect(20, 30, 100, 50)));
+ WindowTreeHost::Create(gfx::Rect(20, 30, 100, 50), context_factory()));
second_host->InitHost();
Window* second_root = second_host->window();
@@ -2080,7 +2082,7 @@ TEST_F(WindowEventDispatcherTest,
window->Show();
scoped_ptr<WindowTreeHost> second_host(
- WindowTreeHost::Create(gfx::Rect(20, 30, 100, 50)));
+ WindowTreeHost::Create(gfx::Rect(20, 30, 100, 50), context_factory()));
second_host->InitHost();
WindowEventDispatcher* second_dispatcher = second_host->dispatcher();
« no previous file with comments | « ui/aura/test/test_screen.cc ('k') | ui/aura/window_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698