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

diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 63dd222..45d4354 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -34,9 +34,9 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
+#include "chrome/views/container.h"
 #include "chrome/views/button_dropdown.h"
 #include "chrome/views/hwnd_view.h"
-#include "chrome/views/view_container.h"
 #include "chrome/views/background.h"
 #include "chrome/views/label.h"
 #include "chrome/views/tooltip_manager.h"
@@ -365,8 +365,8 @@ void BrowserToolbarView::DidGainFocus() {
     acc_focused_view_->SetHotTracked(true);
     
     // Show the tooltip for the view that got the focus.
-    if (GetViewContainer()->GetTooltipManager()) {
-      GetViewContainer()->GetTooltipManager()->
+    if (GetContainer()->GetTooltipManager()) {
+      GetContainer()->GetTooltipManager()->
           ShowKeyboardTooltip(acc_focused_view_);
     }
 
@@ -374,7 +374,7 @@ void BrowserToolbarView::DidGainFocus() {
     view_index = acc_focused_view_->GetID();
   }
 
-  HWND hwnd = GetViewContainer()->GetHWND();
+  HWND hwnd = GetContainer()->GetHWND();
 
   // Notify Access Technology that there was a change in keyboard focus.
   ::NotifyWinEvent(EVENT_OBJECT_FOCUS, hwnd, OBJID_CLIENT,
@@ -385,8 +385,8 @@ void BrowserToolbarView::WillLoseFocus() {
   // Resetting focus state.
   acc_focused_view_->SetHotTracked(false);
   // Any tooltips that are active should be hidden when toolbar loses focus.
-  if (GetViewContainer() && GetViewContainer()->GetTooltipManager())
-    GetViewContainer()->GetTooltipManager()->HideKeyboardTooltip();
+  if (GetContainer() && GetContainer()->GetTooltipManager())
+    GetContainer()->GetTooltipManager()->HideKeyboardTooltip();
   acc_focused_view_ = NULL;
 }
 
@@ -412,8 +412,8 @@ bool BrowserToolbarView::OnKeyPressed(const ChromeViews::KeyEvent& e) {
           acc_focused_view_->GetID() == VIEW_ID_APP_MENU) {
         // If a menu button in toolbar is activated and its menu is displayed,
         // then active tooltip should be hidden.
-        if (GetViewContainer()->GetTooltipManager())
-          GetViewContainer()->GetTooltipManager()->HideKeyboardTooltip();
+        if (GetContainer()->GetTooltipManager())
+          GetContainer()->GetTooltipManager()->HideKeyboardTooltip();
         // Safe to cast, given to above view id check.
         static_cast<ChromeViews::MenuButton*>(acc_focused_view_)->Activate();
         if (!acc_focused_view_) {
@@ -446,11 +446,11 @@ bool BrowserToolbarView::OnKeyPressed(const ChromeViews::KeyEvent& e) {
 
     // Retrieve information to generate an MSAA focus event.
     int view_id = acc_focused_view_->GetID();
-    HWND hwnd = GetViewContainer()->GetHWND();
+    HWND hwnd = GetContainer()->GetHWND();
 
     // Show the tooltip for the view that got the focus.
-    if (GetViewContainer()->GetTooltipManager()) {
-      GetViewContainer()->GetTooltipManager()->
+    if (GetContainer()->GetTooltipManager()) {
+      GetContainer()->GetTooltipManager()->
           ShowKeyboardTooltip(GetChildViewAt(next_view));
     }
     // Notify Access Technology that there was a change in keyboard focus.
@@ -737,6 +737,6 @@ bool BrowserToolbarView::GetAcceleratorInfo(int id,
       return true;
   }
   // Else, we retrieve the accelerator information from the frame.
-  return GetViewContainer()->GetAccelerator(id, accel);
+  return GetContainer()->GetAccelerator(id, accel);
 }