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..869c0fad596aaf9feaa799f7fe09d6061ca66cc8 100644
--- a/ui/views/widget/native_widget_gtk.cc
+++ b/ui/views/widget/native_widget_gtk.cc
@@ -648,18 +648,17 @@ void NativeWidgetGtk::InitNativeWidget(const Widget::InitParams& params) {
                              GDK_WINDOW_TYPE_HINT_MENU);
   }
 
+  // TODO(piman): is this useful?
   if (View::get_use_acceleration_when_possible()) {

[Ben Goodger (Google), 2012/01/28 00:40:13]

I bet not, and this could probablybe removed.

[piman, 2012/01/28 01:50:35]

Done.

     gint width, height;
     gdk_drawable_get_size(window_contents_->window, &width, &height);
-    compositor_ = ui::Compositor::Create(this,
+    compositor_ = new ui::Compositor(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_);
-    }
+    View* root_view = delegate_->AsWidget()->GetRootView();
+    root_view->SetPaintToLayer(true);
+    compositor_->SetRootLayer(root_view->layer());
+    root_view->SetFillsBoundsOpaquely(!transparent_);
   }
 
   delegate_->OnNativeWidgetCreated();