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, 5 deletions

diff --git a/chrome/views/native_scroll_bar.cc b/chrome/views/native_scroll_bar.cc
index 6058646..53c5189 100644
--- a/chrome/views/native_scroll_bar.cc
+++ b/chrome/views/native_scroll_bar.cc
@@ -11,8 +11,8 @@
 #include <atlframe.h>
 
 #include "base/message_loop.h"
+#include "chrome/views/container.h"
 #include "chrome/views/hwnd_view.h"
-#include "chrome/views/view_container.h"
 
 namespace ChromeViews {
 
@@ -30,7 +30,7 @@ class ScrollBarContainer : public CWindowImpl<ScrollBarContainer,
  public:
   ScrollBarContainer(ScrollBar* parent) : parent_(parent),
                                           scrollbar_(NULL) {
-    Create(parent->GetViewContainer()->GetHWND());
+    Create(parent->GetContainer()->GetHWND());
     ::ShowWindow(m_hWnd, SW_SHOW);
   }
 
@@ -126,7 +126,7 @@ class ScrollBarContainer : public CWindowImpl<ScrollBarContainer,
     // If we receive an event from the scrollbar, make the view
     // component focused so we actually get mousewheel events.
     if (source != NULL) {
-      ViewContainer* vc = parent_->GetViewContainer();
+      Container* vc = parent_->GetContainer();
       if (vc && vc->GetHWND() != GetFocus()) {
         parent_->RequestFocus();
       }
@@ -227,8 +227,8 @@ NativeScrollBar::~NativeScrollBar() {
 
 void NativeScrollBar::ViewHierarchyChanged(bool is_add, View *parent,
                                            View *child) {
-  ViewContainer* vc;
-  if (is_add && (vc = GetViewContainer()) && !sb_view_) {
+  Container* vc;
+  if (is_add && (vc = GetContainer()) && !sb_view_) {
     sb_view_ = new HWNDView();
     AddChildView(sb_view_);
     sb_container_ = new ScrollBarContainer(this);