TabContents -> WebContentsImpl, part 15.

Switch VIEW_TYPE_TAB_CONTENTS to VIEW_TYPE_WEB_CONTENTS.

Also removed all references in comments to TAB_CONTENTS_WEB. TAB_CONTENTS_WEB was a value of the enum TabContentsType, which was removed in r13730.

BUG=105875
TEST=no change

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

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

16 files changed, 25 insertions, 27 deletions

diff --git a/chrome/browser/bookmarks/bookmark_manager_extension_api.cc b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc
index cc5be21..4511d48 100644
--- a/chrome/browser/bookmarks/bookmark_manager_extension_api.cc
+++ b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc
@@ -384,7 +384,7 @@ bool StartDragBookmarkManagerFunction::RunImpl() {
       GetNodesFromArguments(model, args_.get(), 0, &nodes));
 
   if (render_view_host_->GetDelegate()->GetRenderViewType() ==
-      content::VIEW_TYPE_TAB_CONTENTS) {
+      content::VIEW_TYPE_WEB_CONTENTS) {
     WebContents* web_contents =
         dispatcher()->delegate()->GetAssociatedWebContents();
     CHECK(web_contents);
@@ -426,7 +426,7 @@ bool DropBookmarkManagerFunction::RunImpl() {
     drop_index = drop_parent->child_count();
 
   if (render_view_host_->GetDelegate()->GetRenderViewType() ==
-      content::VIEW_TYPE_TAB_CONTENTS) {
+      content::VIEW_TYPE_WEB_CONTENTS) {
     WebContents* web_contents =
         dispatcher()->delegate()->GetAssociatedWebContents();
     CHECK(web_contents);
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 35aed03..6a4a10f0 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -99,7 +99,6 @@ bool WillHandleBrowserAboutURL(GURL* url,
          !url->SchemeIs(chrome::kAboutScheme));
 
   // Only handle chrome://foo/, URLFixerUpper::FixupURL translates about:foo.
-  // TAB_CONTENTS_WEB handles about:blank, which frames are allowed to access.
   if (!url->SchemeIs(chrome::kChromeUIScheme))
     return false;
 
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
index d87fc60..69b4135 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
@@ -448,7 +448,7 @@ void WebNavigationEventRouter::Retargeting(const RetargetingDetails* details) {
     // If you hit this DCHECK(), please add reproduction steps to
     // http://crbug.com/109464.
     DCHECK(details->source_web_contents->GetViewType() !=
-           content::VIEW_TYPE_TAB_CONTENTS);
+           content::VIEW_TYPE_WEB_CONTENTS);
     return;
   }
   const FrameNavigationState& frame_navigation_state =
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index 665dd52..8c42a11 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -624,7 +624,7 @@ void ChromeGeolocationPermissionContext::RequestGeolocationPermission(
   WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_id, render_view_id);
   if (!web_contents || web_contents->GetViewType() !=
-          content::VIEW_TYPE_TAB_CONTENTS) {
+          content::VIEW_TYPE_WEB_CONTENTS) {
     // The tab may have gone away, or the request may not be from a tab at all.
     // TODO(mpcomplete): the request could be from a background page or
     // extension popup (tab_contents will have a different ViewType). But why do
diff --git a/chrome/renderer/extensions/extension_custom_bindings.cc b/chrome/renderer/extensions/extension_custom_bindings.cc
index afb45e0..7b177e1 100644
--- a/chrome/renderer/extensions/extension_custom_bindings.cc
+++ b/chrome/renderer/extensions/extension_custom_bindings.cc
@@ -139,7 +139,7 @@ v8::Handle<v8::Value> ExtensionCustomBindings::GetExtensionViews(
   } else if (view_type_string == chrome::kViewTypeNotification) {
     view_type = chrome::VIEW_TYPE_NOTIFICATION;
   } else if (view_type_string == chrome::kViewTypeTabContents) {
-    view_type = content::VIEW_TYPE_TAB_CONTENTS;
+    view_type = content::VIEW_TYPE_WEB_CONTENTS;
   } else if (view_type_string == chrome::kViewTypePopup) {
     view_type = chrome::VIEW_TYPE_EXTENSION_POPUP;
   } else if (view_type_string == chrome::kViewTypeExtensionDialog) {
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index e071927..4e654a6 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -483,12 +483,12 @@ void RenderViewHostImpl::WasSwappedOut() {
 
     if (!content::RenderProcessHost::run_renderer_in_process() &&
         process_handle && views <= 1) {
-      // We expect the delegate for this RVH to be TabContents, as it is the
+      // We expect the delegate for this RVH to be WebContents, as it is the
       // only class that swaps out render view hosts on navigation.
       DCHECK_EQ(delegate_->GetRenderViewType(),
-                content::VIEW_TYPE_TAB_CONTENTS);
+                content::VIEW_TYPE_WEB_CONTENTS);
 
-      // Kill the process only if TabContents sets SuddenTerminationAllowed,
+      // Kill the process only if WebContents sets SuddenTerminationAllowed,
       // which indicates that the timer has expired.
       // This is not the case if we load data URLs or about:blank. The reason
       // is that there is no network requests and this code is hit without
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc
index 4c650ae5..ddd373a 100644
--- a/content/browser/speech/speech_recognition_manager_impl.cc
+++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -152,14 +152,14 @@ void SpeechRecognitionManagerImpl::CheckRenderViewTypeAndStartRecognition(
   if (!render_view_host || !render_view_host->GetDelegate())
     return;
 
-  // For host delegates other than VIEW_TYPE_TAB_CONTENTS we can't reliably show
+  // For host delegates other than VIEW_TYPE_WEB_CONTENTS we can't reliably show
   // a popup, including the speech input bubble. In these cases for privacy
   // reasons we don't want to start recording if the user can't be properly
   // notified. An example of this is trying to show the speech input bubble
   // within an extension popup: http://crbug.com/92083. In these situations the
   // speech input extension API should be used instead.
   if (render_view_host->GetDelegate()->GetRenderViewType() ==
-      content::VIEW_TYPE_TAB_CONTENTS) {
+      content::VIEW_TYPE_WEB_CONTENTS) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SpeechRecognitionManagerImpl::ProceedStartingRecognition,
diff --git a/content/browser/web_contents/navigation_entry_impl.h b/content/browser/web_contents/navigation_entry_impl.h
index ec194fd..4dc4c9b 100644
--- a/content/browser/web_contents/navigation_entry_impl.h
+++ b/content/browser/web_contents/navigation_entry_impl.h
@@ -65,9 +65,8 @@ class CONTENT_EXPORT NavigationEntryImpl
     unique_id_ = unique_id;
   }
 
-  // The SiteInstance tells us how to share sub-processes when the tab type is
-  // TAB_CONTENTS_WEB. This will be NULL otherwise. This is a reference counted
-  // pointer to a shared site instance.
+  // The SiteInstance tells us how to share sub-processes. This is a reference
+  // counted pointer to a shared site instance.
   //
   // Note that the SiteInstance should usually not be changed after it is set,
   // but this may happen if the NavigationEntry was cloned and needs to use a
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 0c5d55b..3944ff0 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -276,7 +276,7 @@ WebContentsImpl::WebContentsImpl(
           static_cast<int>(content::kMaximumZoomFactor * 100)),
       temporary_zoom_settings_(false),
       content_restrictions_(0),
-      view_type_(content::VIEW_TYPE_TAB_CONTENTS),
+      view_type_(content::VIEW_TYPE_WEB_CONTENTS),
       has_opener_(false),
       color_chooser_(NULL) {
   render_manager_.Init(browser_context, site_instance, routing_id);
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index ce2c461..a45eba6 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -685,7 +685,7 @@ class CONTENT_EXPORT WebContentsImpl
   // (full-page plugins for now only) permissions.
   int content_restrictions_;
 
-  // Our view type. Default is VIEW_TYPE_TAB_CONTENTS.
+  // Our view type. Default is VIEW_TYPE_WEB_CONTENTS.
   content::ViewType view_type_;
 
   // Is there an opener associated with this?
diff --git a/content/public/browser/interstitial_page.h b/content/public/browser/interstitial_page.h
index a8479f3..fcf3e75 100644
--- a/content/public/browser/interstitial_page.h
+++ b/content/public/browser/interstitial_page.h
@@ -85,4 +85,4 @@ class InterstitialPage {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
+#endif  // CONTENT_PUBLIC_BROWSER_INTERSTITIAL_PAGE_H_
diff --git a/content/public/browser/navigation_entry.h b/content/public/browser/navigation_entry.h
index 87923ea..49b8eba 100644
--- a/content/public/browser/navigation_entry.h
+++ b/content/public/browser/navigation_entry.h
@@ -81,9 +81,9 @@ class NavigationEntry {
   virtual void SetContentState(const std::string& state) = 0;
   virtual const std::string& GetContentState() const = 0;
 
-  // Describes the current page that the tab represents. For web pages
-  // (TAB_CONTENTS_WEB) this is the ID that the renderer generated for the page
-  // and is how we can tell new versus renavigations.
+  // Describes the current page that the tab represents. This is the ID that the
+  // renderer generated for the page and is how we can tell new versus
+  // renavigations.
   virtual void SetPageID(int page_id) = 0;
   virtual int32 GetPageID() const = 0;
 
diff --git a/content/public/browser/notification_types.h b/content/public/browser/notification_types.h
index 98ed71d..0b7eb70 100644
--- a/content/public/browser/notification_types.h
+++ b/content/public/browser/notification_types.h
@@ -198,8 +198,8 @@ enum NotificationType {
   // This notification is sent when a WebContents swaps its render view host
   // with another one, possibly changing processes. The source is a
   // Source<WebContents> with a pointer to the WebContents.  A
-  // TAB_CONTENTS_DISCONNECTED notification is guaranteed before the
-  // source pointer becomes junk.  No details are expected.
+  // NOTIFICATION_WEB_CONTENTS_DISCONNECTED notification is guaranteed before
+  // the source pointer becomes junk.  No details are expected.
   NOTIFICATION_WEB_CONTENTS_SWAPPED,
 
   // This message is sent after a WebContents is disconnected from the
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 0c0e86f..89be1ca 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -50,8 +50,8 @@ struct RendererPreferences;
 // Describes what goes in the main content area of a tab.
 class WebContents : public PageNavigator {
  public:
-  // |base_tab_contents| is used if we want to size the new tab contents view
-  // based on an existing tab contents view.  This can be NULL if not needed.
+  // |base_web_contents| is used if we want to size the new web contents view
+  // based on an existing web contents view.  This can be NULL if not needed.
   //
   // The session storage namespace parameter allows multiple render views and
   // tab contentses to share the same session storage (part of the WebStorage
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index 47b9468..e3db1f1 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -94,9 +94,9 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Channel::Listener,
                                 bool blocked_by_policy) {}
 
   // Invoked when the WebContents is being destroyed. Gives subclasses a chance
-  // to cleanup. At the time this is invoked |tab_contents()| returns NULL.
+  // to cleanup. At the time this is invoked |web_contents()| returns NULL.
   // It is safe to delete 'this' from here.
-  virtual void WebContentsDestroyed(WebContents* tab) {}
+  virtual void WebContentsDestroyed(WebContents* web_contents) {}
 
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
diff --git a/content/public/common/view_type.h b/content/public/common/view_type.h
index 9c0f0dc..cad496f 100644
--- a/content/public/common/view_type.h
+++ b/content/public/common/view_type.h
@@ -11,7 +11,7 @@ namespace content {
 // Indicates different types of views.
 enum ViewTypeValues {
   VIEW_TYPE_INVALID,
-  VIEW_TYPE_TAB_CONTENTS,
+  VIEW_TYPE_WEB_CONTENTS,
   VIEW_TYPE_INTERSTITIAL_PAGE,
   VIEW_TYPE_DEV_TOOLS_UI,