diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 15:40:45 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 15:40:45 +0000 |
commit | 10946079e34f1a627e9afa232049469a6655cc17 (patch) | |
tree | 6de5c4fa11f7fb6ede9601de1acc86e4a53aa1b2 /views/view.h | |
parent | 334bef925113a03dac5dc92184ab7ce51e06a386 (diff) | |
download | chromium_src-10946079e34f1a627e9afa232049469a6655cc17.zip chromium_src-10946079e34f1a627e9afa232049469a6655cc17.tar.gz chromium_src-10946079e34f1a627e9afa232049469a6655cc17.tar.bz2 |
Move RootView to the internal namespace.
Most people should not be using the RootView type. The few cases that do should static_cast for now, until I can find a way to expose the functionality they need on Widget.
BUG=72040
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/7040018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view.h')
-rw-r--r-- | views/view.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/views/view.h b/views/view.h index ee979d6..984f50b 100644 --- a/views/view.h +++ b/views/view.h @@ -54,12 +54,15 @@ class FocusManager; class FocusTraversable; class InputMethod; class LayoutManager; -class RootView; class ScrollView; class TextInputClient; class Widget; class Window; +namespace internal { +class RootView; +} + // ContextMenuController is responsible for showing the context menu for a // View. To use a ContextMenuController invoke SetContextMenuController on a // View. When the appropriate user gesture occurs ShowContextMenu is invoked @@ -242,10 +245,6 @@ class View : public AcceleratorTarget { // hierarchy beneath this view. virtual bool ContainsNativeView(gfx::NativeView native_view) const; - // TODO(beng): REMOVE (RootView->internal API) - // Get the containing RootView - virtual RootView* GetRootView(); - // Size and disposition ------------------------------------------------------ // Methods for obtaining and modifying the position and size of the view. // Position is in the coordinate system of the view's parent. @@ -997,7 +996,7 @@ class View : public AcceleratorTarget { // it - like registering accelerators, for example. virtual void NativeViewHierarchyChanged(bool attached, gfx::NativeView native_view, - RootView* root_view); + internal::RootView* root_view); // Painting ------------------------------------------------------------------ @@ -1130,9 +1129,10 @@ class View : public AcceleratorTarget { static int GetVerticalDragThreshold(); private: - friend class RootView; + friend class internal::RootView; friend class FocusManager; friend class ViewStorage; + friend class Widget; // Used to track a drag. RootView passes this into // ProcessMousePressed/Dragged. @@ -1179,7 +1179,7 @@ class View : public AcceleratorTarget { // children. void PropagateNativeViewHierarchyChanged(bool attached, gfx::NativeView native_view, - RootView* root_view); + internal::RootView* root_view); // Takes care of registering/unregistering accelerators if // |register_accelerators| true and calls ViewHierarchyChanged(). |