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

views/widget/widget_impl.h

 // 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.
 
 #ifndef VIEWS_WIDGET_WIDGET_IMPL_H_
 #define VIEWS_WIDGET_WIDGET_IMPL_H_
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
@@ skipping 131 matching lines @@
                                            const gfx::Point& point);
   virtual bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator);
   virtual Window* GetWindow();
   virtual const Window* GetWindow() const;
   virtual void SetNativeWindowProperty(const char* name, void* value);
   virtual void* GetNativeWindowProperty(const char* name);
   virtual ThemeProvider* GetDefaultThemeProvider() const;
   virtual void ViewHierarchyChanged(bool is_add, View *parent,
                                     View *child);
   virtual bool ContainsNativeView(gfx::NativeView native_view);
+  virtual void StartDragForViewFromMouseEvent(View* view,
+                                              const OSExchangeData& data,
+                                              int operation);
+  virtual View* GetDraggedView();
 
   // Causes the Widget to be destroyed immediately.
   void CloseNow();
 
   // A NativeWidget implementation. This can be changed dynamically to a
   // different implementation during the lifetime of the Widget.
   scoped_ptr<NativeWidget> native_widget_;
 
   // A RootView that owns the View hierarchy within this Widget.
   scoped_ptr<RootView> root_view_;
@@ skipping 11 matching lines @@
 
   // Handles closing the Widget after a return to the message loop to allow the
   // stack to unwind.
   ScopedRunnableMethodFactory<WidgetImpl> close_widget_factory_;
 
   // True if the Widget should be automatically deleted when it is destroyed.
   bool delete_on_destroy_;
 
   scoped_ptr<FocusManager> focus_manager_;
 
+  // Valid for the lifetime of StartDragForViewFromMouseEvent, indicates the
+  // view the drag started from. NULL at all other times.
+  View* dragged_view_;
+
   DISALLOW_COPY_AND_ASSIGN(WidgetImpl);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_WIDGET_IMPL_H_