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

Unified Diff: ui/aura/window_tree_host_mac.mm

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_mac.h ('k') | ui/aura/window_tree_host_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_tree_host_mac.mm
diff --git a/ui/aura/window_tree_host_mac.mm b/ui/aura/window_tree_host_mac.mm
index 7fb3f82a2eccfaf21e25016c10aab245ff45a461..fd41bcff2cb70f881c3a41845d6f04409b85e5af 100644
--- a/ui/aura/window_tree_host_mac.mm
+++ b/ui/aura/window_tree_host_mac.mm
@@ -9,14 +9,15 @@
namespace aura {
-WindowTreeHostMac::WindowTreeHostMac(const gfx::Rect& bounds) {
+WindowTreeHostMac::WindowTreeHostMac(const gfx::Rect& bounds,
+ ui::ContextFactory* context_factory) {
window_.reset(
[[NSWindow alloc]
initWithContentRect:NSRectFromCGRect(bounds.ToCGRect())
styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered
defer:NO]);
- CreateCompositor(GetAcceleratedWidget());
+ CreateCompositor(GetAcceleratedWidget(), context_factory);
}
WindowTreeHostMac::~WindowTreeHostMac() {
@@ -101,8 +102,9 @@ void WindowTreeHostMac::OnDeviceScaleFactorChanged(float device_scale_factor) {
}
// static
-WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds) {
- return new WindowTreeHostMac(bounds);
+WindowTreeHost* WindowTreeHost::Create(const gfx::Rect& bounds,
+ ui::ContextFactory* context_factory) {
+ return new WindowTreeHostMac(bounds, context_factory);
}
// static
« no previous file with comments | « ui/aura/window_tree_host_mac.h ('k') | ui/aura/window_tree_host_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698