Merge Compositor and CompositorCC

ui/views/widget/native_widget_gtk.cc

 // Copyright (c) 2012 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.
 
 #include "ui/views/widget/native_widget_gtk.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>
 #include <gdk/gdk.h>
@@ skipping 630 matching lines @@
 
   // Make container here.
   CreateGtkWidget(modified_params);
 
   if (params.type == Widget::InitParams::TYPE_MENU) {
     gtk_window_set_destroy_with_parent(GTK_WINDOW(GetNativeView()), TRUE);
     gtk_window_set_type_hint(GTK_WINDOW(GetNativeView()),
                              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();
 
   if (opacity_ != 255)
     SetOpacity(opacity_);
 
   // Make sure we receive our motion events.
 
   // In general we register most events on the parent of all widgets. At a
@@ skipping 1531 matching lines @@
     button_pressed = event->type == GDK_BUTTON_PRESS ||
         event->type == GDK_2BUTTON_PRESS ||
         event->type == GDK_3BUTTON_PRESS;
     gdk_event_free(event);
   }
   return button_pressed;
 }
 
 }  // namespace internal
 }  // namespace views