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, 13 insertions, 13 deletions

diff --git a/chrome/views/root_view.cc b/chrome/views/root_view.cc
index c5b1979..5e7beff 100644
--- a/chrome/views/root_view.cc
+++ b/chrome/views/root_view.cc
@@ -12,7 +12,7 @@
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/root_view_drop_target.h"
-#include "chrome/views/view_container.h"
+#include "chrome/views/container.h"
 
 namespace ChromeViews {
 
@@ -51,8 +51,8 @@ const char RootView::kViewClassName[] = "chrome/views/RootView";
 //
 /////////////////////////////////////////////////////////////////////////////
 
-RootView::RootView(ViewContainer* view_container)
-  : view_container_(view_container),
+RootView::RootView(Container* container)
+  : container_(container),
     invalid_rect_(0,0,0,0),
     mouse_pressed_handler_(NULL),
     mouse_move_handler_(NULL),
@@ -178,7 +178,7 @@ void RootView::PaintNow() {
   }
   if (!paint_task_needed_)
     return;
-  ViewContainer* vc = GetViewContainer();
+  Container* vc = GetContainer();
   if (vc)
     vc->PaintNow(invalid_rect_);
 }
@@ -216,8 +216,8 @@ CRect RootView::GetScheduledPaintRectConstrainedToSize() {
 //
 /////////////////////////////////////////////////////////////////////////////
 
-ViewContainer* RootView::GetViewContainer() const {
-  return view_container_;
+Container* RootView::GetContainer() const {
+  return container_;
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -315,7 +315,7 @@ bool RootView::OnMousePressed(const MouseEvent& e) {
   mouse_pressed_handler_ = NULL;
 
   if (focus_on_mouse_pressed_) {
-    HWND hwnd = view_container_->GetHWND();
+    HWND hwnd = container_->GetHWND();
     if (::GetFocus() != hwnd) {
       ::SetFocus(hwnd);
     }
@@ -331,7 +331,7 @@ bool RootView::ConvertPointToMouseHandler(const gfx::Point& l,
   // window. (a non explicit mouse handler is automatically
   // cleared when the control is removed from the hierarchy)
   if (explicit_mouse_handler_) {
-    if (mouse_pressed_handler_->GetViewContainer()) {
+    if (mouse_pressed_handler_->GetContainer()) {
       *p = l;
       ConvertPointToScreen(this, p);
       ConvertPointToView(NULL, mouse_pressed_handler_, p);
@@ -463,17 +463,17 @@ void RootView::SetMouseHandler(View *new_mh) {
   mouse_pressed_handler_ = new_mh;
 }
 
-void RootView::OnViewContainerCreated() {
+void RootView::OnContainerCreated() {
   DCHECK(!drop_target_.get());
   drop_target_ = new RootViewDropTarget(this);
 }
 
-void RootView::OnViewContainerDestroyed() {
+void RootView::OnContainerDestroyed() {
   if (drop_target_.get()) {
-    RevokeDragDrop(GetViewContainer()->GetHWND());
+    RevokeDragDrop(GetContainer()->GetHWND());
     drop_target_ = NULL;
   }
-  view_container_ = NULL;
+  container_ = NULL;
 }
 
 void RootView::ProcessMouseDragCanceled() {
@@ -493,7 +493,7 @@ void RootView::FocusView(View* view) {
   if (view != GetFocusedView()) {
     FocusManager* focus_manager = GetFocusManager();
     DCHECK(focus_manager) << "No Focus Manager for Window " <<
-        (GetViewContainer() ? GetViewContainer()->GetHWND() : 0);
+        (GetContainer() ? GetContainer()->GetHWND() : 0);
     if (!focus_manager)
       return;