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

7 files changed, 15 insertions, 15 deletions

diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index 0c04dd8..7df768c 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -505,7 +505,7 @@ void ContentSection::ButtonPressed(ChromeViews::NativeButton* sender) {
     disable_popup_blocked_notification_pref_.SetValue(!notification_disabled);
   } else if (sender == gears_settings_button_) {
     UserMetricsRecordAction(L"Options_GearsSettings", NULL);
-    GearsSettingsPressed(GetAncestor(GetViewContainer()->GetHWND(), GA_ROOT));
+    GearsSettingsPressed(GetAncestor(GetContainer()->GetHWND(), GA_ROOT));
   }
 }
 
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 510976a..52911a4 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -25,11 +25,11 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/checkbox.h"
+#include "chrome/views/container.h"
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/native_button.h"
 #include "chrome/views/radio_button.h"
 #include "chrome/views/text_field.h"
-#include "chrome/views/view_container.h"
 #include "generated_resources.h"
 #include "skia/include/SkBitmap.h"
 
@@ -127,7 +127,7 @@ gfx::Size FileDisplayArea::GetPreferredSize() {
 void FileDisplayArea::ViewHierarchyChanged(bool is_add,
                                            ChromeViews::View* parent,
                                            ChromeViews::View* child) {
-  if (!initialized_ && is_add && GetViewContainer())
+  if (!initialized_ && is_add && GetContainer())
     Init();
 }
 
diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc
index a93fe2c..b147d4e 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.cc
+++ b/chrome/browser/views/options/fonts_languages_window_view.cc
@@ -75,7 +75,7 @@ gfx::Size FontsLanguagesWindowView::GetPreferredSize() {
 
 void FontsLanguagesWindowView::ViewHierarchyChanged(
     bool is_add, ChromeViews::View* parent, ChromeViews::View* child) {
-  // Can't init before we're inserted into a ViewContainer, because we require
+  // Can't init before we're inserted into a Container, because we require
   // a HWND to parent native child controls to.
   if (is_add && child == this)
     Init();
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index 0dd8bab..7bd8836 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -26,11 +26,11 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/checkbox.h"
+#include "chrome/views/container.h"
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/native_button.h"
 #include "chrome/views/radio_button.h"
 #include "chrome/views/text_field.h"
-#include "chrome/views/view_container.h"
 #include "generated_resources.h"
 #include "skia/include/SkBitmap.h"
 
@@ -228,7 +228,7 @@ FontsPageView::~FontsPageView() {
 }
 
 void FontsPageView::ButtonPressed(ChromeViews::NativeButton* sender) {
-  HWND owning_hwnd = GetAncestor(GetViewContainer()->GetHWND(), GA_ROOT);
+  HWND owning_hwnd = GetAncestor(GetContainer()->GetHWND(), GA_ROOT);
   std::wstring font_name;
   int font_size = 0;
   if (sender == serif_font_change_page_button_) {
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 9a22c74..240bbe3 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -28,12 +28,12 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/checkbox.h"
 #include "chrome/views/combo_box.h"
+#include "chrome/views/container.h"
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/native_button.h"
 #include "chrome/views/radio_button.h"
 #include "chrome/views/tabbed_pane.h"
 #include "chrome/views/text_field.h"
-#include "chrome/views/view_container.h"
 #include "skia/include/SkBitmap.h"
 #include "unicode/uloc.h"
 
@@ -305,7 +305,7 @@ gfx::Size AddLanguageWindowView::GetPreferredSize() {
 
 void AddLanguageWindowView::ViewHierarchyChanged(
     bool is_add, ChromeViews::View* parent, ChromeViews::View* child) {
-  // Can't init before we're inserted into a ViewContainer, because we require
+  // Can't init before we're inserted into a Container, because we require
   // a HWND to parent native child controls to.
   if (is_add && child == this)
     Init();
@@ -503,7 +503,7 @@ void LanguagesPageView::ButtonPressed(ChromeViews::NativeButton* sender) {
     language_table_edited_ = true;
   } else if (sender == add_button_) {
     ChromeViews::Window::CreateChromeWindow(
-        GetViewContainer()->GetHWND(),
+        GetContainer()->GetHWND(),
         gfx::Rect(),
         new AddLanguageWindowView(this, profile()))->Show();
     language_table_edited_ = true;
diff --git a/chrome/browser/views/options/options_page_view.cc b/chrome/browser/views/options/options_page_view.cc
index d6ea955..5672397 100644
--- a/chrome/browser/views/options/options_page_view.cc
+++ b/chrome/browser/views/options/options_page_view.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/view_container.h"
+#include "chrome/views/container.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsPageView
@@ -43,7 +43,7 @@ void OptionsPageView::Observe(NotificationType type,
 void OptionsPageView::ViewHierarchyChanged(bool is_add,
                                            ChromeViews::View* parent,
                                            ChromeViews::View* child) {
-  if (!initialized_ && is_add && GetViewContainer()) {
+  if (!initialized_ && is_add && GetContainer()) {
     // It is important that this only get done _once_ otherwise we end up
     // duplicating the view hierarchy when tabs are switched.
     initialized_ = true;
@@ -53,7 +53,7 @@ void OptionsPageView::ViewHierarchyChanged(bool is_add,
 }
 
 HWND OptionsPageView::GetRootWindow() const {
-  // Our ViewContainer is the TabbedPane content HWND, which is a child HWND.
+  // Our Container is the TabbedPane content HWND, which is a child HWND.
   // We need the root HWND for parenting.
-  return GetAncestor(GetViewContainer()->GetHWND(), GA_ROOT);
+  return GetAncestor(GetContainer()->GetHWND(), GA_ROOT);
 }
diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc
index 57138f0..4393a7e 100644
--- a/chrome/browser/views/options/options_window_view.cc
+++ b/chrome/browser/views/options/options_window_view.cc
@@ -172,8 +172,8 @@ gfx::Size OptionsWindowView::GetPreferredSize() {
 void OptionsWindowView::ViewHierarchyChanged(bool is_add,
                                              ChromeViews::View* parent,
                                              ChromeViews::View* child) {
-  // Can't init before we're inserted into a ViewContainer, because we require
-  // a HWND to parent native child controls to.
+  // Can't init before we're inserted into a Container, because we require a
+  // HWND to parent native child controls to.
   if (is_add && child == this)
     Init();
 }