Remove usages of RootView from View by moving relevant RootView API methods t...

views/widget/widget_gtk.cc

 // Copyright (c) 2010 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/widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 
 #include <set>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
 #include "ui/gfx/path.h"
+#include "views/focus/view_storage.h"
 #include "views/widget/default_theme_provider.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/root_view.h"
 #include "views/widget/tooltip_manager_gtk.h"
 #include "views/widget/widget_delegate.h"
 #include "views/widget/widget_utils.h"
 #include "views/window/window_gtk.h"
 
@@ skipping 212 matching lines @@
       opacity_(255),
       drag_data_(NULL),
       in_paint_now_(false),
       is_active_(false),
       transient_to_parent_(false),
       got_initial_focus_in_(false),
       has_focus_(false),
       delegate_(NULL),
       always_on_top_(false),
       is_double_buffered_(false),
-      should_handle_menu_key_release_(false) {
+      should_handle_menu_key_release_(false),
+      dragged_view_(NULL) {
   static bool installed_message_loop_observer = false;
   if (!installed_message_loop_observer) {
     installed_message_loop_observer = true;
     MessageLoopForUI* loop = MessageLoopForUI::current();
     if (loop)
       loop->AddObserver(DropObserver::GetInstance());
   }
 
   if (type_ != TYPE_CHILD)
     focus_manager_ = new FocusManager(this);
@@ skipping 568 matching lines @@
     // dealing with cases where the widget has been unparented.
     return root->GetFocusManager();
   }
   return NULL;
 }
 
 void WidgetGtk::ViewHierarchyChanged(bool is_add, View *parent,
                                      View *child) {
   if (drop_target_.get())
     drop_target_->ResetTargetViewIfEquals(child);
+
+  if (!is_add) {
+    if (child == dragged_view_)
+      dragged_view_ = NULL;
+
+    FocusManager* focus_manager = GetFocusManager();
+    if (focus_manager)
+      focus_manager->ViewRemoved(parent, child);
+    ViewStorage::GetInstance()->ViewRemoved(parent, child);
+  }
 }
 
 bool WidgetGtk::ContainsNativeView(gfx::NativeView native_view) {
   // TODO(port)  See implementation in WidgetWin::ContainsNativeView.
   NOTREACHED() << "WidgetGtk::ContainsNativeView is not implemented.";
   return false;
 }
 
+void WidgetGtk::StartDragForViewFromMouseEvent(
+    View* view,
+    const OSExchangeData& data,
+    int operation) {
+  // NOTE: view may be null.
+  dragged_view_ = view;
+  DoDrag(data, operation);
+  // If the view is removed during the drag operation, drag_view_ is set to

[sky, 2011/02/17 00:37:46]

drag_view_ -> dragged_view_

+  // NULL.
+  if (view && dragged_view_ == view) {
+    dragged_view_ = NULL;
+    view->OnDragDone();
+  }
+}
+
+View* WidgetGtk::GetDraggedView() {
+  return dragged_view_;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WidgetGtk, FocusTraversable implementation:
 
 FocusSearch* WidgetGtk::GetFocusSearch() {
   return root_view_->GetFocusSearch();
 }
 
 FocusTraversable* WidgetGtk::GetFocusTraversableParent() {
   // We are a proxy to the root view, so we should be bypassed when traversing
   // up and as a result this should not be called.
@@ skipping 798 matching lines @@
     GtkWindow* window = GTK_WINDOW(element->data);
     DCHECK(window);
     RootView *root_view = FindRootView(window);
     if (root_view)
       root_view->NotifyLocaleChanged();
   }
   g_list_free(window_list);
 }
 
 }  // namespace views