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

Unified Diff: ash/host/ash_window_tree_host_x11.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.h ('k') | ash/host/ash_window_tree_host_x11_unittest.cc » ('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.cc
diff --git a/ash/host/ash_window_tree_host_x11.cc b/ash/host/ash_window_tree_host_x11.cc
index a050a349f021cc26bd10af2f92763a52e51e9b03..ac15df78a3861b70a443e7b1c33477276d5a598c 100644
--- a/ash/host/ash_window_tree_host_x11.cc
+++ b/ash/host/ash_window_tree_host_x11.cc
@@ -30,8 +30,9 @@
namespace ash {
-AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds)
- : WindowTreeHostX11(initial_bounds),
+AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds,
+ ui::ContextFactory* context_factory)
+ : WindowTreeHostX11(initial_bounds, context_factory),
transformer_helper_(this),
display_ids_(std::make_pair(gfx::Display::kInvalidDisplayID,
gfx::Display::kInvalidDisplayID)) {
@@ -284,7 +285,8 @@ void AshWindowTreeHostX11::SetCrOSTapPaused(bool state) {
AshWindowTreeHost* AshWindowTreeHost::Create(
const AshWindowTreeHostInitParams& init_params) {
- return new AshWindowTreeHostX11(init_params.initial_bounds);
+ return new AshWindowTreeHostX11(init_params.initial_bounds,
+ init_params.context_factory);
}
} // namespace ash
« no previous file with comments | « ash/host/ash_window_tree_host_x11.h ('k') | ash/host/ash_window_tree_host_x11_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698