TabContents -> WebContentsImpl, part 23.

TabContents -> WebContents in chrome/, part 6.

BUG=105875
TEST=no change

Review URL: https://chromiumcodereview.appspot.com/10116002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132819 0039d316-1c4b-4281-b951-d872f2087c98

22 files changed, 48 insertions, 50 deletions

diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.h b/chrome/browser/ui/panels/panel_window_controller_cocoa.h
index 4e2f78a..5181347 100644
--- a/chrome/browser/ui/panels/panel_window_controller_cocoa.h
+++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.h
@@ -70,7 +70,7 @@ class PanelBrowserWindowCocoa;
 - (void)tabDetached:(content::WebContents*)contents;
 
 // Sometimes (when we animate the size of the window) we want to stop resizing
-// the TabContents' cocoa view to avoid unnecessary rendering and issues
+// the WebContents's Cocoa view to avoid unnecessary rendering and issues
 // that can be caused by sizes near 0.
 - (void)disableTabContentsViewAutosizing;
 - (void)enableTabContentsViewAutosizing;
diff --git a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
index 5a97d7f..86e2463 100644
--- a/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
+++ b/chrome/browser/ui/panels/panel_window_controller_cocoa.mm
@@ -910,7 +910,7 @@ enum {
   BrowserList::SetLastActive(windowShim_->browser());
 
   // We need to activate the controls (in the "WebView"). To do this, get the
-  // selected TabContents's RenderWidgetHostView and tell it to activate.
+  // selected WebContents's RenderWidgetHostView and tell it to activate.
   if (WebContents* contents = [contentsController_ webContents]) {
     if (content::RenderWidgetHostView* rwhv =
         contents->GetRenderWidgetHostView())
@@ -939,7 +939,7 @@ enum {
     return;
 
   // We need to deactivate the controls (in the "WebView"). To do this, get the
-  // selected TabContents's RenderWidgetHostView and tell it to deactivate.
+  // selected WebContents's RenderWidgetHostView and tell it to deactivate.
   if (WebContents* contents = [contentsController_ webContents]) {
     if (content::RenderWidgetHostView* rwhv =
         contents->GetRenderWidgetHostView())
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h
index ffab13b..16c3d13 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.h
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.h
@@ -39,7 +39,7 @@ class PrefsTabHelper : public content::NotificationObserver {
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Update the TabContents's RendererPreferences.
+  // Update the WebContents's RendererPreferences.
   void UpdateRendererPreferences();
 
   Profile* GetProfile();
diff --git a/chrome/browser/ui/sad_tab_helper.cc b/chrome/browser/ui/sad_tab_helper.cc
index 66c9c3d..491862b 100644
--- a/chrome/browser/ui/sad_tab_helper.cc
+++ b/chrome/browser/ui/sad_tab_helper.cc
@@ -35,7 +35,7 @@ SadTabHelper::~SadTabHelper() {
 }
 
 void SadTabHelper::RenderViewGone(base::TerminationStatus status) {
-  // Only show the sad tab if we're not in browser shutdown, so that TabContents
+  // Only show the sad tab if we're not in browser shutdown, so that WebContents
   // objects that are not in a browser (e.g., HTML dialogs) and thus are
   // visible do not flash a sad tab page.
   if (browser_shutdown::GetShutdownType() != browser_shutdown::NOT_VALID)
diff --git a/chrome/browser/ui/select_file_dialog.h b/chrome/browser/ui/select_file_dialog.h
index 358df0c..081c787 100644
--- a/chrome/browser/ui/select_file_dialog.h
+++ b/chrome/browser/ui/select_file_dialog.h
@@ -126,7 +126,7 @@ class SelectFileDialog
   // |default_extension| is the default extension to add to the file if the
   //   user doesn't type one. This should NOT include the '.'. On Windows, if
   //   you specify this you must also specify |file_types|.
-  // |source_contents| is the TabContents the call is originating from, i.e.
+  // |source_contents| is the WebContents the call is originating from, i.e.
   //   where the InfoBar should be shown in case file-selection dialogs are
   //   forbidden by policy, or NULL if no InfoBar should be shown.
   // |owning_window| is the window the dialog is modal to, or NULL for a
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
index 3d8aaa7..e953857 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
@@ -157,7 +157,7 @@ TabContentsWrapper::TabContentsWrapper(WebContents* contents)
 TabContentsWrapper::~TabContentsWrapper() {
   in_destructor_ = true;
 
-  // Need to tear down infobars before the TabContents goes away.
+  // Need to tear down infobars before the WebContents goes away.
   // TODO(avi): Can we get this handled by the tab helper itself?
   infobar_tab_helper_.reset();
 }
@@ -210,6 +210,6 @@ Profile* TabContentsWrapper::profile() const {
 void TabContentsWrapper::WebContentsDestroyed(WebContents* tab) {
   // Destruction of the WebContents should only be done by us from our
   // destructor. Otherwise it's very likely we (or one of the helpers we own)
-  // will attempt to access the TabContents and we'll crash.
+  // will attempt to access the WebContents and we'll crash.
   DCHECK(in_destructor_);
 }
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
index d573d62..2f4190c 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
@@ -76,13 +76,11 @@ namespace safe_browsing {
 class SafeBrowsingTabObserver;
 }
 
-// Wraps TabContents and all of its supporting objects in order to control
-// their ownership and lifetime, while allowing TabContents to remain generic
-// and re-usable in other projects.
+// Wraps WebContents and all of its supporting objects in order to control
+// their ownership and lifetime.
 //
 // TODO(avi): Eventually, this class will become TabContents as far as
-// the browser front-end is concerned, and the current TabContents will be
-// renamed to something like WebContents; <http://crbug.com/105875>.
+// the browser front-end is concerned.
 class TabContentsWrapper : public content::WebContentsObserver {
  public:
   // Takes ownership of |contents|, which must be heap-allocated (as it lives
@@ -94,12 +92,12 @@ class TabContentsWrapper : public content::WebContentsObserver {
   // heap-allocated pointer is owned by the caller.
   TabContentsWrapper* Clone();
 
-  // Helper to retrieve the existing instance that wraps a given TabContents.
+  // Helper to retrieve the existing instance that wraps a given WebContents.
   // Returns NULL if there is no such existing instance.
   // NOTE: This is not intended for general use. It is intended for situations
-  // like callbacks from content/ where only a TabContents is available. In the
+  // like callbacks from content/ where only a WebContents is available. In the
   // general case, please do NOT use this; plumb TabContentsWrapper through the
-  // chrome/ code instead of TabContents.
+  // chrome/ code instead of WebContents.
   static TabContentsWrapper* GetCurrentWrapperForContents(
       content::WebContents* contents);
   static const TabContentsWrapper* GetCurrentWrapperForContents(
@@ -282,7 +280,7 @@ class TabContentsWrapper : public content::WebContentsObserver {
       safe_browsing_tab_observer_;
   scoped_ptr<ThumbnailGenerator> thumbnail_generation_observer_;
 
-  // TabContents (MUST BE LAST) ------------------------------------------------
+  // WebContents (MUST BE LAST) ------------------------------------------------
 
   // If true, we're running the destructor.
   bool in_destructor_;
diff --git a/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc
index 620a9c99..c542e4b 100644
--- a/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc
+++ b/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc
@@ -37,7 +37,7 @@ void TabContentsWrapperTestHarness::SetUp() {
 void TabContentsWrapperTestHarness::TearDown() {
   contents_wrapper_.reset();
 
-  // Make sure that we flush any messages related to TabContents destruction
+  // Make sure that we flush any messages related to WebContents destruction
   // before we destroy the browser context.
   MessageLoop::current()->RunAllPending();
 
diff --git a/chrome/browser/ui/views/dom_view.h b/chrome/browser/ui/views/dom_view.h
index e9b5f4b..15f45ad 100644
--- a/chrome/browser/ui/views/dom_view.h
+++ b/chrome/browser/ui/views/dom_view.h
@@ -42,7 +42,7 @@ class DOMView : public views::NativeViewHost {
   // Loads the given URL into the page. You must have previously called Init().
   void LoadURL(const GURL& url);
 
-  // The TabContents displaying the DOM contents; may be null.
+  // The TabContentsWrapper displaying the DOM contents; may be null.
   TabContentsWrapper* dom_contents() const { return dom_contents_.get(); }
 
  protected:
@@ -57,8 +57,8 @@ class DOMView : public views::NativeViewHost {
   // implementation varies slightly, while Detach is the same in both cases.
   void AttachTabContents();
 
-  // Returns new allocated TabContents instance, caller is responsible deleting.
-  // Override in derived classes to replace TabContents with derivative.
+  // Returns new allocated WebContents instance, caller is responsible deleting.
+  // Override in derived classes to replace WebContents with derivative.
   virtual content::WebContents* CreateTabContents(
     Profile* profile, content::SiteInstance* instance);
 
diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc
index c3e7018..9ce4cef 100644
--- a/chrome/browser/ui/views/find_bar_host.cc
+++ b/chrome/browser/ui/views/find_bar_host.cc
@@ -111,7 +111,7 @@ void FindBarHost::StopAnimation() {
 
 void FindBarHost::MoveWindowIfNecessary(const gfx::Rect& selection_rect,
                                         bool no_redraw) {
-  // We only move the window if one is active for the current TabContents. If we
+  // We only move the window if one is active for the current WebContents. If we
   // don't check this, then SetWidgetPosition below will end up making the Find
   // Bar visible.
   if (!find_bar_controller_->tab_contents() ||
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 09b65c6..793d1a9 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1391,7 +1391,7 @@ void BrowserView::TabDetachedAt(TabContentsWrapper* contents, int index) {
   if (index == browser_->active_index()) {
     // We need to reset the current tab contents to NULL before it gets
     // freed. This is because the focus manager performs some operations
-    // on the selected TabContents when it is removed.
+    // on the selected WebContents when it is removed.
     contents_container_->SetWebContents(NULL);
     infobar_container_->ChangeTabContents(NULL);
     UpdateDevToolsForContents(NULL);
@@ -2022,7 +2022,7 @@ bool BrowserView::MaybeShowBookmarkBar(TabContentsWrapper* contents) {
 
 bool BrowserView::MaybeShowInfoBar(TabContentsWrapper* contents) {
   // TODO(beng): Remove this function once the interface between
-  //             InfoBarContainer, DownloadShelfView and TabContents and this
+  //             InfoBarContainer, DownloadShelfView and WebContents and this
   //             view is sorted out.
   return true;
 }
@@ -2402,20 +2402,20 @@ void BrowserView::UpdateAcceleratorMetrics(
 }
 
 void BrowserView::ProcessTabSelected(TabContentsWrapper* new_contents) {
-  // If |contents_container_| already has the correct TabContents, we can save
+  // If |contents_container_| already has the correct WebContents, we can save
   // some work.  This also prevents extra events from being reported by the
   // Visibility API under Windows, as ChangeWebContents will briefly hide
-  // the TabContents window.
+  // the WebContents window.
   DCHECK(new_contents);
   bool change_tab_contents =
       contents_container_->web_contents() != new_contents->web_contents();
 
   // Update various elements that are interested in knowing the current
-  // TabContents.
+  // WebContents.
 
   // When we toggle the NTP floating bookmarks bar and/or the info bar,
-  // we don't want any TabContents to be attached, so that we
-  // avoid an unnecessary resize and re-layout of a TabContents.
+  // we don't want any WebContents to be attached, so that we
+  // avoid an unnecessary resize and re-layout of a WebContents.
   if (change_tab_contents)
     contents_container_->SetWebContents(NULL);
   infobar_container_->ChangeTabContents(new_contents->infobar_tab_helper());
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 1d30941..20f2eee 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -171,8 +171,8 @@ class BrowserView : public BrowserWindow,
   // activated, false if none was shown.
   bool ActivateAppModalDialog() const;
 
-  // Returns the selected TabContents[Wrapper]. Used by our NonClientView's
-  // TabIconView::TabContentsProvider implementations.
+  // Returns the selected WebContents/TabContentsWrapper. Used by our
+  // NonClientView's TabIconView::TabContentsProvider implementations.
   // TODO(beng): exposing this here is a bit bogus, since it's only used to
   // determine loading state. It'd be nicer if we could change this to be
   // bool IsSelectedTabLoading() const; or something like that. We could even
@@ -461,14 +461,14 @@ class BrowserView : public BrowserWindow,
   // Layout the Status Bubble.
   void LayoutStatusBubble();
 
-  // Prepare to show the Bookmark Bar for the specified TabContents. Returns
-  // true if the Bookmark Bar can be shown (i.e. it's supported for this
+  // Prepare to show the Bookmark Bar for the specified TabContentsWrapper.
+  // Returns true if the Bookmark Bar can be shown (i.e. it's supported for this
   // Browser type) and there should be a subsequent re-layout to show it.
   // |contents| can be NULL.
   bool MaybeShowBookmarkBar(TabContentsWrapper* contents);
 
-  // Prepare to show an Info Bar for the specified TabContents. Returns true
-  // if there is an Info Bar to show and one is supported for this Browser
+  // Prepare to show an Info Bar for the specified TabContentsWrapper. Returns
+  // true if there is an Info Bar to show and one is supported for this Browser
   // type, and there should be a subsequent re-layout to show it.
   // |contents| can be NULL.
   bool MaybeShowInfoBar(TabContentsWrapper* contents);
@@ -611,13 +611,13 @@ class BrowserView : public BrowserWindow,
   // The InfoBarContainerView that contains InfoBars for the current tab.
   InfoBarContainerView* infobar_container_;
 
-  // The view that contains the selected TabContents.
+  // The view that contains the selected WebContents.
   views::WebView* contents_container_;
 
-  // The view that contains devtools window for the selected TabContents.
+  // The view that contains devtools window for the selected WebContents.
   views::WebView* devtools_container_;
 
-  // The view that contains instant's TabContents.
+  // The view that contains instant's WebContents.
   views::WebView* preview_container_;
 
   // The view managing both the contents_container_ and preview_container_.
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
index 2512073..6efa283 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -270,7 +270,7 @@ void BrowserViewLayout::Layout(views::View* host) {
   top -= active_top_margin;
   contents_container_->SetActiveTopMargin(active_top_margin);
   LayoutTabContents(top, bottom);
-  // This must be done _after_ we lay out the TabContents since this
+  // This must be done _after_ we lay out the WebContents since this
   // code calls back into us to find the bounding box the find bar
   // must be laid out within, and that code depends on the
   // TabContentsContainer's bounds being up to date.
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.h b/chrome/browser/ui/views/frame/browser_view_layout.h
index ef9333c..25f742c 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.h
+++ b/chrome/browser/ui/views/frame/browser_view_layout.h
@@ -74,7 +74,7 @@ class BrowserViewLayout : public views::LayoutManager {
   int LayoutBookmarkBar(int top);
   int LayoutInfoBar(int top);
 
-  // Layout the TabContents container, between the coordinates |top| and
+  // Layout the WebContents container, between the coordinates |top| and
   // |bottom|.
   void LayoutTabContents(int top, int bottom);
 
diff --git a/chrome/browser/ui/views/frame/contents_container.h b/chrome/browser/ui/views/frame/contents_container.h
index 43b88e3..4e6ab7a 100644
--- a/chrome/browser/ui/views/frame/contents_container.h
+++ b/chrome/browser/ui/views/frame/contents_container.h
@@ -12,9 +12,9 @@ namespace content {
 class WebContents;
 }
 
-// ContentsContainer is responsible for managing the TabContents views.
+// ContentsContainer is responsible for managing the WebContents views.
 // ContentsContainer has up to two children: one for the currently active
-// TabContents and one for instant's TabContents.
+// WebContents and one for instant's WebContents.
 class ContentsContainer : public views::View {
  public:
   // Internal class name
diff --git a/chrome/browser/ui/views/html_dialog_view.h b/chrome/browser/ui/views/html_dialog_view.h
index 57bb8f4..1523b36 100644
--- a/chrome/browser/ui/views/html_dialog_view.h
+++ b/chrome/browser/ui/views/html_dialog_view.h
@@ -118,7 +118,7 @@ class HtmlDialogView
   // until the property is removed.
   bool initialized_;
 
-  // Watches for TabContents rendering.
+  // Watches for WebContents rendering.
   scoped_ptr<TabRenderWatcher> tab_watcher_;
 
   // This view is a delegate to the HTML content since it needs to get notified
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.h b/chrome/browser/ui/views/location_bar/page_action_image_view.h
index 47e269d..26b8436 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.h
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.h
@@ -71,7 +71,7 @@ class PageActionImageView : public views::ImageView,
   virtual bool CanHandleAccelerators() const OVERRIDE;
 
   // Called to notify the PageAction that it should determine whether to be
-  // visible or hidden. |contents| is the TabContents that is active, |url| is
+  // visible or hidden. |contents| is the WebContents that is active, |url| is
   // the current page URL.
   void UpdateVisibility(content::WebContents* contents, const GURL& url);
 
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 6f5ef5e..08ac207 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -117,7 +117,7 @@ struct AutocompleteEditState {
 };
 
 // Returns a lazily initialized property bag accessor for saving our state in a
-// TabContents.
+// WebContents.
 base::PropertyAccessor<AutocompleteEditState>* GetStateAccessor() {
   CR_DEFINE_STATIC_LOCAL(
       base::PropertyAccessor<AutocompleteEditState>, state, ());
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index e1dc536..ed02394 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -370,7 +370,7 @@ BOOL WINAPI EndPaintIntercept(HWND hWnd, const PAINTSTRUCT* lpPaint) {
 }
 
 // Returns a lazily initialized property bag accessor for saving our state in a
-// TabContents.
+// WebContents.
 base::PropertyAccessor<AutocompleteEditState>* GetStateAccessor() {
   static base::PropertyAccessor<AutocompleteEditState> state;
   return &state;
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc
index 39fabd0..be1c0e0 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc
@@ -232,7 +232,7 @@ void NativeTabContentsViewWin::OnWindowPosChanged(WINDOWPOS* window_pos) {
   if (window_pos->flags & SWP_HIDEWINDOW) {
     delegate_->OnNativeTabContentsViewHidden();
   } else {
-    // The TabContents was shown by a means other than the user selecting a
+    // The WebContents was shown by a means other than the user selecting a
     // Tab, e.g. the window was minimized then restored.
     if (window_pos->flags & SWP_SHOWWINDOW)
       delegate_->OnNativeTabContentsViewShown();
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h
index a74ba5b..36e0432 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.h
@@ -75,7 +75,7 @@ class NativeTabContentsViewWin : public views::NativeWidgetWin,
   internal::NativeTabContentsViewDelegate* delegate_;
 
   scoped_ptr<WebDragBookmarkHandlerWin> bookmark_handler_;
-  // A drop target object that handles drags over this TabContents.
+  // A drop target object that handles drags over this WebContents.
   scoped_refptr<WebDragDest> drag_dest_;
 
   // Used to handle the drag-and-drop.
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
index 5b44826..a9f56bf 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.cc
@@ -145,7 +145,7 @@ void TabContentsViewViews::Focus() {
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(web_contents_);
   if (wrapper) {
-    // TODO(erg): TabContents used to own constrained windows, which is why
+    // TODO(erg): WebContents used to own constrained windows, which is why
     // this is here. Eventually this should be ported to a containing view
     // specializing in constrained window management.
     ConstrainedWindowTabHelper* helper =
@@ -374,7 +374,7 @@ void TabContentsViewViews::OnNativeTabContentsViewWheelZoom(bool zoom_in) {
 }
 
 void TabContentsViewViews::OnNativeTabContentsViewMouseDown() {
-  // Make sure this TabContents is activated when it is clicked on.
+  // Make sure this WebContents is activated when it is clicked on.
   if (web_contents_->GetDelegate())
     web_contents_->GetDelegate()->ActivateContents(web_contents_);
 }