Rename Container->Widget
R=erg
review url = http://codereview.chromium.org/11348/show
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5849 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/views/view.h b/chrome/views/view.h
index d6b16ce1..383473f 100644
--- a/chrome/views/view.h
+++ b/chrome/views/view.h
@@ -32,13 +32,13 @@
class Background;
class Border;
-class Container;
class FocusManager;
class FocusTraversable;
class LayoutManager;
class RestoreFocusTask;
class RootView;
class ScrollView;
+class Widget;
// ContextMenuController is responsible for showing the context menu for a
// View. To use a ContextMenuController invoke SetContextMenuController on a
@@ -424,8 +424,8 @@
// Get the child View at the specified point.
virtual View* GetViewForPoint(const gfx::Point& point);
- // Get the Container that hosts this View, if any.
- virtual Container* GetContainer() const;
+ // Get the Widget that hosts this View, if any.
+ virtual Widget* GetWidget() const;
// Get the containing RootView
virtual RootView* GetRootView();
@@ -496,8 +496,8 @@
virtual void SetFocusable(bool focusable);
// Convenience method to retrieve the FocusManager associated with the
- // container window that contains this view. This can return NULL if this
- // view is not part of a view hierarchy with a Container.
+ // Widget that contains this view. This can return NULL if this view is not
+ // part of a view hierarchy with a Widget.
virtual FocusManager* GetFocusManager();
// Sets a keyboard accelerator for that view. When the user presses the
@@ -672,13 +672,13 @@
gfx::Point* point);
// Convert a point from the coordinate system of a View to that of the
- // Container. This is useful for example when sizing HWND children of the
- // Container that don't know about the View hierarchy and need to be placed
- // relative to the Container that is their parent.
- static void ConvertPointToContainer(View* src, gfx::Point* point);
+ // Widget. This is useful for example when sizing HWND children of the
+ // Widget that don't know about the View hierarchy and need to be placed
+ // relative to the Widget that is their parent.
+ static void ConvertPointToWidget(View* src, gfx::Point* point);
- // Convert a point from a view Container to a View dest
- static void ConvertPointFromContainer(View *dest, gfx::Point* p);
+ // Convert a point from a view Widget to a View dest
+ static void ConvertPointFromWidget(View *dest, gfx::Point* p);
// Convert a point from the coordinate system of a View to that of the
// screen. This is useful for example when placing popup windows.
@@ -1050,8 +1050,8 @@
// set and gives an opportunity to subclasses to perform any extra focus steps
// (for example native component set the native focus on their native
// component). The default behavior is to set the native focus on the root
- // view container, which is what is appropriate for views that have no native
- // window associated with them (so the root view gets the keyboard messages).
+ // Widget, which is what is appropriate for views that have no native window
+ // associated with them (so the root view gets the keyboard messages).
virtual void Focus();
// Invoked when a key is pressed before the key event is processed by the
@@ -1171,7 +1171,7 @@
gfx::Point* point,
bool try_other_direction);
- // Propagates UpdateTooltip() to the TooltipManager for the Container.
+ // Propagates UpdateTooltip() to the TooltipManager for the Widget.
// This must be invoked any time the View hierarchy changes in such a way
// the view under the mouse differs. For example, if the bounds of a View is
// changed, this is invoked. Similarly, as Views are added/removed, this
