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

Unified Diff: ash/host/ash_window_tree_host_x11_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 | « ash/host/ash_window_tree_host_x11.cc ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host_x11_unittest.cc
diff --git a/ash/host/ash_window_tree_host_x11_unittest.cc b/ash/host/ash_window_tree_host_x11_unittest.cc
index 12aa7bb51807628ebf134160bbc1048358dec47f..275cb99b4ee475b1b91ff2785036540cfbe8cb4e 100644
--- a/ash/host/ash_window_tree_host_x11_unittest.cc
+++ b/ash/host/ash_window_tree_host_x11_unittest.cc
@@ -68,7 +68,7 @@ TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) {
base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
scoped_ptr<aura::WindowTreeHostX11> window_tree_host(
- new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700)));
+ new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700), context_factory()));
window_tree_host->InitHost();
scoped_ptr<RootWindowEventHandler> handler(
new RootWindowEventHandler(window_tree_host.get()));
@@ -134,14 +134,15 @@ TEST_F(AshWindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
scoped_ptr<aura::WindowTreeHostX11> window_tree_host1(
- new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700)));
+ new AshWindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700), context_factory()));
window_tree_host1->InitHost();
scoped_ptr<RootWindowEventHandler> handler1(
new RootWindowEventHandler(window_tree_host1.get()));
int host2_y_offset = 1700;
scoped_ptr<aura::WindowTreeHostX11> window_tree_host2(
- new AshWindowTreeHostX11(gfx::Rect(0, host2_y_offset, 1920, 1080)));
+ new AshWindowTreeHostX11(gfx::Rect(0, host2_y_offset, 1920, 1080),
+ context_factory()));
window_tree_host2->InitHost();
scoped_ptr<RootWindowEventHandler> handler2(
new RootWindowEventHandler(window_tree_host2.get()));
« no previous file with comments | « ash/host/ash_window_tree_host_x11.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698