NOT FOR REVIEW: Aura on Android

ui/views/cocoa/bridged_native_widget.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ui/views/cocoa/bridged_native_widget.h"
 
 #import <objc/runtime.h>
 
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
@@ skipping 975 matching lines @@
       ViewsDelegate::GetInstance()->GetContextFactory();
   DCHECK(context_factory);
 
   AddCompositorSuperview();
 
   // TODO(tapted): Get this value from GpuDataManagerImpl via ViewsDelegate.
   bool needs_gl_finish_workaround = false;
 
   compositor_widget_.reset(
       new ui::AcceleratedWidgetMac(needs_gl_finish_workaround));
-  compositor_.reset(new ui::Compositor(compositor_widget_->accelerated_widget(),
-                                       context_factory,
-                                       base::ThreadTaskRunnerHandle::Get()));
+  compositor_.reset(
+      new ui::Compositor(context_factory, base::ThreadTaskRunnerHandle::Get()));
+  compositor_->OnAcceleratedWidgetAvailable(
+      compositor_widget_->accelerated_widget());
   compositor_widget_->SetNSView(this);
 }
 
 void BridgedNativeWidget::InitCompositor() {
   DCHECK(layer());
   float scale_factor = GetDeviceScaleFactorFromView(compositor_superview_);
   gfx::Size size_in_dip = GetClientAreaSize();
   compositor_->SetScaleAndSize(scale_factor,
                                ConvertSizeToPixel(scale_factor, size_in_dip));
   compositor_->SetRootLayer(layer());
@@ skipping 80 matching lines @@
   [bridged_view_ setMouseDownCanMoveWindow:draggable];
   // AppKit will not update its cache of mouseDownCanMoveWindow unless something
   // changes. Previously we tried adding an NSView and removing it, but for some
   // reason it required reposting the mouse-down event, and didn't always work.
   // Calling the below seems to be an effective solution.
   [window_ setMovableByWindowBackground:NO];
   [window_ setMovableByWindowBackground:YES];
 }
 
 }  // namespace views