summaryrefslogtreecommitdiffstats
path: root/views/widget/widget.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-20 15:40:45 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-20 15:40:45 +0000
commit10946079e34f1a627e9afa232049469a6655cc17 (patch)
tree6de5c4fa11f7fb6ede9601de1acc86e4a53aa1b2 /views/widget/widget.h
parent334bef925113a03dac5dc92184ab7ce51e06a386 (diff)
downloadchromium_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/widget/widget.h')
-rw-r--r--views/widget/widget.h18
1 files changed, 13 insertions, 5 deletions
diff --git a/views/widget/widget.h b/views/widget/widget.h
index f7c12ae..c19be52 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -36,11 +36,13 @@ namespace views {
class DefaultThemeProvider;
class InputMethod;
class NativeWidget;
-class RootView;
class TooltipManager;
class View;
class WidgetDelegate;
class Window;
+namespace internal {
+class RootView;
+}
////////////////////////////////////////////////////////////////////////////////
// Widget class
@@ -120,6 +122,11 @@ class Widget : public internal::NativeWidgetDelegate,
const Widget* target,
gfx::Rect* rect);
+ // SetPureViews and IsPureViews update and return the state of a global
+ // setting that tracks whether to use available pure Views implementations
+ static void SetPureViews(bool pure);
+ static bool IsPureViews();
+
void Init(const InitParams& params);
// Unconverted methods -------------------------------------------------------
@@ -212,8 +219,9 @@ class Widget : public internal::NativeWidgetDelegate,
// Sets the widget to be on top of all other widgets in the windowing system.
void SetAlwaysOnTop(bool on_top);
- // Returns the RootView contained by this Widget.
- RootView* GetRootView();
+ // Returns the View at the root of the View hierarchy contained by this
+ // Widget.
+ View* GetRootView();
// A secondary widget is one that is automatically closed (via Close()) when
// all non-secondary widgets are closed.
@@ -334,7 +342,7 @@ class Widget : public internal::NativeWidgetDelegate,
// Creates the RootView to be used within this Widget. Subclasses may override
// to create custom RootViews that do specialized event processing.
// TODO(beng): Investigate whether or not this is needed.
- virtual RootView* CreateRootView();
+ virtual internal::RootView* CreateRootView();
// Provided to allow the NativeWidget implementations to destroy the RootView
// _before_ the focus manager/tooltip manager.
@@ -373,7 +381,7 @@ class Widget : public internal::NativeWidgetDelegate,
// The root of the View hierarchy attached to this window.
// WARNING: see warning in tooltip_manager_ for ordering dependencies with
// this and tooltip_manager_.
- scoped_ptr<RootView> root_view_;
+ scoped_ptr<internal::RootView> root_view_;
// The focus manager keeping track of focus for this Widget and any of its
// children. NULL for non top-level widgets.