TabContents -> WebContentsImpl, part 16

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 258 matching lines @@
 #endif
       is_showing_before_unload_dialog_(false),
       opener_web_ui_type_(WebUI::kNoWebUI),
       closed_by_user_gesture_(false),
       minimum_zoom_percent_(
           static_cast<int>(content::kMinimumZoomFactor * 100)),
       maximum_zoom_percent_(
           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);
 
   view_.reset(content::GetContentClient()->browser()->
       OverrideCreateWebContentsView(this));
   if (!view_.get()) {
     content::WebContentsViewDelegate* delegate =
         content::GetContentClient()->browser()->GetWebContentsViewDelegate(
             this);
 #if defined(USE_AURA)
     view_.reset(new WebContentsViewAura(this, delegate));
 #elif defined(OS_WIN)
     view_.reset(new WebContentsViewWin(this, delegate));
 #elif defined(TOOLKIT_GTK)
     view_.reset(new content::WebContentsViewGtk(this, delegate));
 #elif defined(OS_MACOSX)
     view_.reset(web_contents_view_mac::CreateWebContentsView(this, delegate));
 #elif defined(OS_ANDROID)
     view_.reset(new WebContentsViewAndroid(this));
 #endif
     (void)delegate;
   }
   CHECK(view_.get());
 
-  // We have the initial size of the view be based on the size of the passed in
-  // tab contents (normally a tab from the same window).
+  // We have the initial size of the view be based on the size of the view of
+  // the passed in WebContents.
   view_->CreateView(base_web_contents ?
       base_web_contents->GetView()->GetContainerSize() : gfx::Size());
 
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_host_manager_.reset(
       new JavaBridgeDispatcherHostManager(this));
 #endif
 
   browser_plugin_web_contents_observer_.reset(
       new content::BrowserPluginWebContentsObserver(this));
 }
 
 WebContentsImpl::~WebContentsImpl() {
   is_being_destroyed_ = true;
 
   // Clear out any JavaScript state.
   if (dialog_creator_)
     dialog_creator_->ResetJavaScriptState(this);
 
   if (color_chooser_)
     color_chooser_->End();
 
   NotifyDisconnected();
 
-  // Notify any observer that have a reference on this tab contents.
+  // Notify any observer that have a reference on this WebContents.
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
       content::Source<WebContents>(this),
       content::NotificationService::NoDetails());
 
   // TODO(brettw) this should be moved to the view.
 #if defined(OS_WIN) && !defined(USE_AURA)
   // If we still have a window handle, destroy it. GetNativeView can return
   // NULL if this contents was part of a window that closed.
   if (GetNativeView()) {
@@ skipping 2281 matching lines @@
 void WebContentsImpl::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
   // Can be NULL during tests.
   if (rwh_view)
     rwh_view->SetSize(GetView()->GetContainerSize());
 }
 
 RenderViewHostImpl* WebContentsImpl::GetRenderViewHostImpl() {
   return static_cast<RenderViewHostImpl*>(GetRenderViewHost());
 }