Rename ViewContainer to Container and HWNDViewContainer to ContainerWin.

http://crbug.com/3430
Review URL: http://codereview.chromium.org/7376

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3441 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index bb93238..b174dc8 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -273,8 +273,7 @@ void DraggedTabController::DidProcessMessage(const MSG& msg) {
 void DraggedTabController::InitWindowCreatePoint() {
   window_create_point_.SetPoint(mouse_offset_.x(), mouse_offset_.y());
   Tab* first_tab = attached_tabstrip_->GetTabAt(0);
-  ChromeViews::View::ConvertPointToViewContainer(first_tab,
-                                                 &window_create_point_);
+  ChromeViews::View::ConvertPointToContainer(first_tab, &window_create_point_);
 }
 
 gfx::Point DraggedTabController::GetWindowCreatePoint() const {
@@ -386,7 +385,7 @@ void DraggedTabController::MoveTab(const gfx::Point& screen_point) {
 
 TabStrip* DraggedTabController::GetTabStripForPoint(
     const gfx::Point& screen_point) const {
-  HWND dragged_hwnd = view_->GetViewContainer()->GetHWND();
+  HWND dragged_hwnd = view_->GetContainer()->GetHWND();
   HWND other_hwnd = WindowFinder::WindowForPoint(screen_point, dragged_hwnd);
   if (!other_hwnd)
     return NULL;
@@ -487,7 +486,7 @@ void DraggedTabController::Attach(TabStrip* attached_tabstrip,
   tab->SetVisible(false);
 
   // Move the corresponding window to the front.
-  attached_tabstrip_->GetViewContainer()->MoveToFront(true);
+  attached_tabstrip_->GetContainer()->MoveToFront(true);
 }
 
 void DraggedTabController::Detach() {
@@ -679,7 +678,7 @@ void DraggedTabController::RevertDrag() {
   // it has been hidden.
   if (restore_frame) {
     if (!restore_bounds_.IsEmpty()) {
-      HWND frame_hwnd = source_tabstrip_->GetViewContainer()->GetHWND();
+      HWND frame_hwnd = source_tabstrip_->GetContainer()->GetHWND();
       MoveWindow(frame_hwnd, restore_bounds_.x(), restore_bounds_.y(),
                  restore_bounds_.width(), restore_bounds_.height(), TRUE);
     }
@@ -747,7 +746,7 @@ int DraggedTabController::NormalizeIndexToAttachedTabStrip(int index) const {
 void DraggedTabController::HideFrame() {
   // We don't actually hide the window, rather we just move it way off-screen.
   // If we actually hide it, we stop receiving drag events.
-  HWND frame_hwnd = source_tabstrip_->GetViewContainer()->GetHWND();
+  HWND frame_hwnd = source_tabstrip_->GetContainer()->GetHWND();
   RECT wr;
   GetWindowRect(frame_hwnd, &wr);
   MoveWindow(frame_hwnd, 0xFFFF, 0xFFFF, wr.right - wr.left,