Removing GTK code from ui/views.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9804001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127852 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 48 deletions

diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index ba97ae9..6ffedc3 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -1174,18 +1174,6 @@ void Widget::DestroyRootView() {
   root_view_.reset();
   // Input method has to be destroyed before focus manager.
   input_method_.reset();
-#if defined(TOOLKIT_USES_GTK)
-  // Defer focus manager's destruction. This is for the case when the
-  // focus manager is referenced by a child NativeWidgetGtk (e.g. TabbedPane in
-  // a dialog). When gtk_widget_destroy is called on the parent, the destroy
-  // signal reaches parent first and then the child. Thus causing the parent
-  // NativeWidgetGtk's dtor executed before the child's. If child's view
-  // hierarchy references this focus manager, it crashes. This will defer focus
-  // manager's destruction after child NativeWidgetGtk's dtor.
-  FocusManager* focus_manager = focus_manager_.release();
-  if (focus_manager)
-    MessageLoop::current()->DeleteSoon(FROM_HERE, focus_manager);
-#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index 9dad2f3..e33bb83 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -659,9 +659,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   void DestroyRootView();
 
  private:
-  // TODO(beng): Remove NativeWidgetGtk's dependence on the mouse state flags.
-  friend class NativeWidgetGtk;
-
   friend class NativeTextfieldViewsTest;
   friend class NativeComboboxViewsTest;
   friend class ScopedEvent;
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index 143c51e..685adfc 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -18,8 +18,6 @@
 #include "ui/views/widget/native_widget_aura.h"
 #elif defined(OS_WIN)
 #include "ui/views/widget/native_widget_win.h"
-#elif defined(TOOLKIT_USES_GTK)
-#include "ui/views/widget/native_widget_gtk.h"
 #endif
 
 namespace views {
@@ -30,13 +28,11 @@ namespace {
 typedef NativeWidgetAura NativeWidgetPlatform;
 #elif defined(OS_WIN)
 typedef NativeWidgetWin NativeWidgetPlatform;
-#elif defined(TOOLKIT_USES_GTK)
-typedef NativeWidgetGtk NativeWidgetPlatform;
 #endif
 
-// A widget that assumes mouse capture always works. It won't on Gtk/Aura in
+// A widget that assumes mouse capture always works. It won't on Aura in
 // testing, so we mock it.
-#if defined(TOOLKIT_USES_GTK) || defined(USE_AURA)
+#if defined(USE_AURA)
 class NativeWidgetCapture : public NativeWidgetPlatform {
  public:
   NativeWidgetCapture(internal::NativeWidgetDelegate* delegate)
@@ -69,8 +65,6 @@ class NativeWidgetCapture : public NativeWidgetPlatform {
 typedef NativeWidgetCapture NativeWidgetPlatformForTest;
 #elif defined(OS_WIN)
 typedef NativeWidgetWin NativeWidgetPlatformForTest;
-#elif defined(TOOLKIT_USES_GTK)
-typedef NativeWidgetCapture NativeWidgetPlatformForTest;
 #endif
 
 // A view that always processes all mouse events.
@@ -186,13 +180,7 @@ TEST_F(WidgetTest, WidgetInitParams) {
 TEST_F(WidgetTest, GetTopLevelWidget_Native) {
   // Create a hierarchy of native widgets.
   Widget* toplevel = CreateTopLevelPlatformWidget();
-#if defined(TOOLKIT_USES_GTK)
-  NativeWidgetGtk* native_widget =
-      static_cast<NativeWidgetGtk*>(toplevel->native_widget());
-  gfx::NativeView parent = native_widget->window_contents();
-#else
   gfx::NativeView parent = toplevel->GetNativeView();
-#endif
   Widget* child = CreateChildPlatformWidget(parent);
 
   EXPECT_EQ(toplevel, toplevel->GetTopLevelWidget());
@@ -288,13 +276,7 @@ TEST_F(WidgetTest, ChangeActivation) {
 // Tests visibility of child widgets.
 TEST_F(WidgetTest, Visibility) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
-#if defined(TOOLKIT_USES_GTK)
-  NativeWidgetGtk* native_widget =
-      static_cast<NativeWidgetGtk*>(toplevel->native_widget());
-  gfx::NativeView parent = native_widget->window_contents();
-#else
   gfx::NativeView parent = toplevel->GetNativeView();
-#endif
   Widget* child = CreateChildPlatformWidget(parent);
 
   EXPECT_FALSE(toplevel->IsVisible());
@@ -523,12 +505,7 @@ TEST_F(WidgetOwnershipTest, Ownership_PlatformNativeWidgetOwnsWidget) {
 }
 
 // NativeWidget owns its Widget, part 2: NativeWidget is a NativeWidget.
-#if defined(TOOLKIT_USES_GTK)
-// Temporarily disable the test (http://crbug.com/104945).
-TEST_F(WidgetOwnershipTest, DISABLED_Ownership_ViewsNativeWidgetOwnsWidget) {
-#else
 TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget) {
-#endif
   OwnershipTestState state;
 
   Widget* toplevel = CreateTopLevelPlatformWidget();
@@ -568,8 +545,6 @@ TEST_F(WidgetOwnershipTest,
   delete widget->GetNativeView();
 #elif defined(OS_WIN)
   DestroyWindow(widget->GetNativeView());
-#elif defined(TOOLKIT_USES_GTK)
-  gtk_widget_destroy(widget->GetNativeView());
 #endif
 
   EXPECT_TRUE(state.widget_deleted);
@@ -578,14 +553,8 @@ TEST_F(WidgetOwnershipTest,
 
 // NativeWidget owns its Widget, part 4: NativeWidget is a NativeWidget,
 // destroyed by the view hierarchy that contains it.
-#if defined(TOOLKIT_USES_GTK)
-// Temporarily disable the test (http://crbug.com/104945).
-TEST_F(WidgetOwnershipTest,
-       DISABLED_Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) {
-#else
 TEST_F(WidgetOwnershipTest,
        Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) {
-#endif
   OwnershipTestState state;
 
   Widget* toplevel = CreateTopLevelPlatformWidget();