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

views/widget/root_view.h

 // 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.
 
 #ifndef VIEWS_WIDGET_ROOT_VIEW_H_
 #define VIEWS_WIDGET_ROOT_VIEW_H_
 #pragma once
 
 #include <string>
 
@@ skipping 104 matching lines @@
   //
   // Note: this is a single view at this point. We may want to make
   // this a list if needed.
   void SetDefaultKeyboardHandler(View* v);
 
   // Process a mousewheel event. Return true if the event was processed
   // and false otherwise.
   // MouseWheel events are sent on the focus path.
   virtual bool ProcessMouseWheelEvent(const MouseWheelEvent& e);
 
-  // Starts a drag operation for the specified view. This blocks until done.
-  // If the view has not been deleted during the drag, OnDragDone is invoked
-  // on the view.
-  // NOTE: |view| may be null.
-  void StartDragForViewFromMouseEvent(View* view,
-                                      const OSExchangeData& data,
-                                      int operation);
-
 #if defined(TOUCH_UI) && defined(UNIT_TEST)
   // For unit testing purposes, we use this method to set a mock
   // GestureManager
   void SetGestureManager(GestureManager* g) { gesture_manager_ = g; }
 #endif
 
   // Focus ---------------------------------------------------------------------
 
-  // Make the provided view focused. Also make sure that our Widget is focused.
-  void FocusView(View* view);
-
-  // Returns the View in this RootView hierarchy that has the focus, or NULL if
-  // no View currently has the focus.
-  View* GetFocusedView();
-
   // Set whether this root view should focus the corresponding hwnd
   // when an unprocessed mouse event occurs.
   void SetFocusOnMousePressed(bool f);
 
   // Used to set the FocusTraversable parent after the view has been created
   // (typically when the hierarchy changes and this RootView is added/removed).
   virtual void SetFocusTraversableParent(FocusTraversable* focus_traversable);
 
   // Used to set the View parent after the view has been created.
   virtual void SetFocusTraversableParentView(View* view);
@@ skipping 60 matching lines @@
   // event handlers to honor the cursor desired by views located under the
   // cursor during drag operations.
   void UpdateCursor(const MouseEvent& e);
 
   // Sets the current cursor, or resets it to the last one if NULL is provided.
   void SetActiveCursor(gfx::NativeCursor cursor);
 
   // Updates the last_mouse_* fields from e.
   void SetMouseLocationAndFlags(const MouseEvent& e);
 
-  // Drag and drop -------------------------------------------------------------
-
-  // If a view is dragging, this returns it. Otherwise returns NULL.
-  View* GetDragView();
-
   //////////////////////////////////////////////////////////////////////////////
 
   // Tree operations -----------------------------------------------------------
 
   // The host Widget
   Widget* widget_;
 
   // Painting ------------------------------------------------------------------
 
   // The rectangle that should be painted
@@ skipping 75 matching lines @@
 
   // The View that contains this RootView. This is used when we have RootView
   // wrapped inside native components, and is used for the focus traversal.
   View* focus_traversable_parent_view_;
 
   // Drag and drop -------------------------------------------------------------
 
   // Tracks drag state for a view.
   View::DragInfo drag_info;
 
-  // Valid for the lifetime of StartDragForViewFromMouseEvent, indicates the
-  // view the drag started from.
-  View* drag_view_;
-
   DISALLOW_IMPLICIT_CONSTRUCTORS(RootView);
 };
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_ROOT_VIEW_H_