Merge Compositor and CompositorCC

ui/views/widget/native_widget_gtk.cc

Index: ui/views/widget/native_widget_gtk.cc
diff --git a/ui/views/widget/native_widget_gtk.cc b/ui/views/widget/native_widget_gtk.cc
index 410fadafed268494135549cb01f3ea931e489809..338e49fe47bc34988e28678389b3649f76aa7f6f 100644
--- a/ui/views/widget/native_widget_gtk.cc
+++ b/ui/views/widget/native_widget_gtk.cc
@@ -648,20 +648,6 @@ void NativeWidgetGtk::InitNativeWidget(const Widget::InitParams& params) {
                              GDK_WINDOW_TYPE_HINT_MENU);
   }
 
-  if (View::get_use_acceleration_when_possible()) {
-    gint width, height;
-    gdk_drawable_get_size(window_contents_->window, &width, &height);
-    compositor_ = ui::Compositor::Create(this,
-        GDK_WINDOW_XID(window_contents_->window),
-        gfx::Size(width, height));
-    if (compositor_.get()) {
-      View* root_view = delegate_->AsWidget()->GetRootView();
-      root_view->SetPaintToLayer(true);
-      compositor_->SetRootLayer(root_view->layer());
-      root_view->SetFillsBoundsOpaquely(!transparent_);
-    }
-  }
-
   delegate_->OnNativeWidgetCreated();
 
   if (opacity_ != 255)