Now that we are doing a hard-cut-over to Aura, remove a bunch of *Views based classes that are ob...

views/widget/native_widget_gtk.cc

 // Copyright (c) 2011 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 "views/widget/native_widget_gtk.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>
 #include <gdk/gdk.h>
@@ skipping 22 matching lines @@
 #include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/ime/input_method_gtk.h"
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/views_delegate.h"
 #include "views/widget/drop_target_gtk.h"
 #include "views/widget/gtk_views_fixed.h"
 #include "views/widget/gtk_views_window.h"
-#include "views/widget/native_widget_views.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_delegate.h"
 
 #if defined(TOUCH_UI)
 #include "ui/base/touch/touch_factory.h"
 #include "views/widget/tooltip_manager_views.h"
 #else
 #include "views/widget/tooltip_manager_gtk.h"
 #endif
 
@@ skipping 931 matching lines @@
 }
 
 bool NativeWidgetGtk::HasMouseCapture() const {
   return GTK_WIDGET_HAS_GRAB(window_contents_) || has_pointer_grab_;
 }
 
 InputMethod* NativeWidgetGtk::CreateInputMethod() {
   // Create input method when pure views is enabled but not on views desktop.
   // TODO(suzhe): Always enable input method when we start to use
   // RenderWidgetHostViewViews in normal ChromeOS.
-  if (views::Widget::IsPureViews() &&
-      !ViewsDelegate::views_delegate->GetDefaultParentView()) {
+  if (views::Widget::IsPureViews()) {
 #if defined(HAVE_IBUS)
     InputMethod* input_method =
         InputMethodIBus::IsInputMethodIBusEnabled() ?
         static_cast<InputMethod*>(new InputMethodIBus(this)) :
         static_cast<InputMethod*>(new InputMethodGtk(this));
 #else
     InputMethod* input_method = new InputMethodGtk(this);
 #endif
     input_method->Init(GetWidget());
     return input_method;
   }
-  // GTK's textfield or InputMethod in NativeWidgetViews will handle IME.
+  // GTK's textfield will handle IME.
   return NULL;
 }
 
 void NativeWidgetGtk::CenterWindow(const gfx::Size& size) {
   gfx::Rect center_rect;
 
   GtkWindow* parent = gtk_window_get_transient_for(GetNativeWindow());
   if (parent) {
     // We have a parent window, center over it.
     gint parent_x = 0;
@@ skipping 330 matching lines @@
     gtk_widget_grab_focus(native_view);
 }
 
 bool NativeWidgetGtk::ConvertPointFromAncestor(
     const Widget* ancestor, gfx::Point* point) const {
   NOTREACHED();
   return false;
 }
 
 gfx::Rect NativeWidgetGtk::GetWorkAreaBoundsInScreen() const {
-  ViewsDelegate *delegate = ViewsDelegate::views_delegate;
-  if (delegate && delegate->GetDefaultParentView()) {
-    // For views-desktop, the work area is the entire space inside this
-    // containter window.
-    return gfx::Rect(gfx::Point(0, 0),
-                     delegate->GetDefaultParentView()->size());
-  } else
-    return gfx::Screen::GetMonitorWorkAreaNearestWindow(GetNativeView());
+  return gfx::Screen::GetMonitorWorkAreaNearestWindow(GetNativeView());
 }
 
 void NativeWidgetGtk::SetInactiveRenderingDisabled(bool value) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetGtk, protected:
 
 void NativeWidgetGtk::OnSizeRequest(GtkWidget* widget,
                                     GtkRequisition* requisition) {
@@ skipping 831 matching lines @@
 }
 
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetPrivate, public:
 
 // static
 NativeWidgetPrivate* NativeWidgetPrivate::CreateNativeWidget(
     NativeWidgetDelegate* delegate) {
-  if (Widget::IsPureViews() && ViewsDelegate::views_delegate &&
-      ViewsDelegate::views_delegate->GetDefaultParentView()) {
-    return new NativeWidgetViews(delegate);
-  }
   return new NativeWidgetGtk(delegate);
 }
 
 // static
 NativeWidgetPrivate* NativeWidgetPrivate::GetNativeWidgetForNativeView(
     gfx::NativeView native_view) {
   if (!native_view)
     return NULL;
   return reinterpret_cast<NativeWidgetGtk*>(
       g_object_get_data(G_OBJECT(native_view), kNativeWidgetKey));
@@ skipping 84 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