1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 8e3a2c5..51081bd 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -26,8 +26,8 @@
 #include "chrome/common/win_util.h"
 #include "chrome/views/background.h"
 #include "chrome/views/border.h"
+#include "chrome/views/container.h"
 #include "chrome/views/root_view.h"
-#include "chrome/views/view_container.h"
 #include "generated_resources.h"
 
 using ChromeViews::View;
@@ -123,7 +123,7 @@ void LocationBarView::Init() {
   }
 
   // URL edit field.
-  ChromeViews::ViewContainer* vc = GetViewContainer();
+  ChromeViews::Container* vc = GetContainer();
   DCHECK(vc) << "LocationBarView::Init - vc is NULL!";
   location_entry_.reset(new AutocompleteEditView(font_, this, model_, this,
                                                  vc->GetHWND(),
@@ -843,7 +843,7 @@ void LocationBarView::ShowInfoBubbleTask::Run() {
   if (cancelled_)
     return;
 
-  if (!image_view_->GetViewContainer()->IsActive()) {
+  if (!image_view_->GetContainer()->IsActive()) {
     // The browser is no longer active.  Let's not show the info bubble, this
     // would make the browser the active window again.  Also makes sure we NULL
     // show_info_bubble_task_ to prevent the SecurityImageView from keeping a
@@ -864,7 +864,7 @@ void LocationBarView::ShowInfoBubbleTask::Cancel() {
 void LocationBarView::ShowFirstRunBubbleInternal() {
   if (!location_entry_view_)
     return;
-  if (!location_entry_view_->GetViewContainer()->IsActive()) {
+  if (!location_entry_view_->GetContainer()->IsActive()) {
     // The browser is no longer active.  Let's not show the info bubble, this
     // would make the browser the active window again.
     return;
@@ -889,7 +889,7 @@ void LocationBarView::ShowFirstRunBubbleInternal() {
     bounds.set_x(location.x() - 20);
 
   FirstRunBubble::Show(
-      location_entry_view_->GetRootView()->GetViewContainer()->GetHWND(),
+      location_entry_view_->GetRootView()->GetContainer()->GetHWND(),
       bounds);
 }
 
@@ -962,7 +962,7 @@ void LocationBarView::SecurityImageView::ShowInfoBubble() {
   label->SetHorizontalAlignment(ChromeViews::Label::ALIGN_LEFT);
   label->SizeToFit(0);
   DCHECK(info_bubble_ == NULL);
-  info_bubble_ = InfoBubble::Show(GetRootView()->GetViewContainer()->GetHWND(),
+  info_bubble_ = InfoBubble::Show(GetRootView()->GetContainer()->GetHWND(),
                                   bounds, label, this);
   show_info_bubble_task_ = NULL;
 }
@@ -1006,7 +1006,7 @@ bool LocationBarView::SecurityImageView::OnMousePressed(
   }
   PageInfoWindow::CreatePageInfo(profile_,
                                  nav_entry,
-                                 GetRootView()->GetViewContainer()->GetHWND(),
+                                 GetRootView()->GetContainer()->GetHWND(),
                                  PageInfoWindow::SECURITY);
   return true;
 }