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

1 files changed, 9 insertions, 9 deletions

diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index ffa4891..549bedf 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -21,9 +21,9 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/os_exchange_data.h"
 #include "chrome/views/border.h"
-#include "chrome/views/container_win.h"
 #include "chrome/views/root_view.h"
 #include "chrome/views/view_constants.h"
+#include "chrome/views/widget_win.h"
 #include "generated_resources.h"
 
 #undef min
@@ -542,9 +542,9 @@ class MenuSeparator : public View {
 
 class MenuHostRootView : public RootView {
  public:
-  explicit MenuHostRootView(Container* container,
+  explicit MenuHostRootView(Widget* widget,
                             SubmenuView* submenu)
-      : RootView(container),
+      : RootView(widget),
         submenu_(submenu),
         forward_drag_to_menu_controller_(true),
         suspend_events_(false) {
@@ -648,7 +648,7 @@ class MenuHostRootView : public RootView {
 // DelayedClosed, which avoids timing issues with deleting the window while
 // capture or events are directed at it.
 
-class MenuHost : public ContainerWin {
+class MenuHost : public WidgetWin {
  public:
   MenuHost(SubmenuView* submenu)
       : closed_(false),
@@ -672,7 +672,7 @@ class MenuHost : public ContainerWin {
             const gfx::Rect& bounds,
             View* contents_view,
             bool do_capture) {
-    ContainerWin::Init(parent, bounds, true);
+    WidgetWin::Init(parent, bounds, true);
     SetContentsView(contents_view);
     // We don't want to take focus away from the hosting window.
     ShowWindow(SW_SHOWNA);
@@ -699,17 +699,17 @@ class MenuHost : public ContainerWin {
     GetRootView()->RemoveAllChildViews(false);
     closed_ = true;
     ReleaseCapture();
-    ContainerWin::Hide();
+    WidgetWin::Hide();
   }
 
   virtual void HideWindow() {
     // Make sure we release capture before hiding.
     ReleaseCapture();
-    ContainerWin::Hide();
+    WidgetWin::Hide();
   }
 
   virtual void OnCaptureChanged(HWND hwnd) {
-    ContainerWin::OnCaptureChanged(hwnd);
+    WidgetWin::OnCaptureChanged(hwnd);
     owns_capture_ = false;
 #ifdef DEBUG_MENU
     DLOG(INFO) << "Capture changed";
@@ -2638,7 +2638,7 @@ bool MenuController::IsMenuWindow(MenuItemView* item, HWND window) {
   if (!item)
     return false;
   return ((item->HasSubmenu() && item->GetSubmenu()->IsShowing() &&
-           item->GetSubmenu()->GetContainer()->GetHWND() == window) ||
+           item->GetSubmenu()->GetWidget()->GetHWND() == window) ||
            IsMenuWindow(item->GetParentMenuItem(), window));
 }