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

Unified Diff: ui/aura/window_tree_host_ozone.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/window_tree_host_ozone.h ('k') | ui/aura/window_tree_host_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_tree_host_ozone.cc
diff --git a/ui/aura/window_tree_host_ozone.cc b/ui/aura/window_tree_host_ozone.cc
index 5b8be534b98dbfcf65f5677730dd2c29858cd717..9d372576a2f66edd646249f71afc3e1aed9ba8bc 100644
--- a/ui/aura/window_tree_host_ozone.cc
+++ b/ui/aura/window_tree_host_ozone.cc
@@ -12,7 +12,8 @@
namespace aura {
-WindowTreeHostOzone::WindowTreeHostOzone(const gfx::Rect& bounds)
+WindowTreeHostOzone::WindowTreeHostOzone(const gfx::Rect& bounds,
+ ui::ContextFactory* context_factory)
: widget_(0),
bounds_(bounds) {
gfx::SurfaceFactoryOzone* surface_factory =
@@ -20,7 +21,7 @@ WindowTreeHostOzone::WindowTreeHostOzone(const gfx::Rect& bounds)
widget_ = surface_factory->GetAcceleratedWidget();
ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
- CreateCompositor(GetAcceleratedWidget());
+ CreateCompositor(GetAcceleratedWidget(), context_factory);
}
WindowTreeHostOzone::~WindowTreeHostOzone() {
@@ -105,8 +106,9 @@ ui::EventProcessor* WindowTreeHostOzone::GetEventProcessor() {
}
// static
-WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) {
- return new WindowTreeHostOzone(bounds);
+WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds,
+ ui::ContextFactory* context_factory) {
+ return new WindowTreeHostOzone(bounds, context_factory);
}
// static
« no previous file with comments | « ui/aura/window_tree_host_ozone.h ('k') | ui/aura/window_tree_host_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698