Get rid of the RenderViewType concept in content, since it was only used by Chrome. Store the enum…

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 233 matching lines @@
     SessionStorageNamespace* session_storage_namespace) {
   return new WebContentsImpl(
       browser_context,
       site_instance,
       routing_id,
       static_cast<const WebContentsImpl*>(base_web_contents),
       NULL,
       static_cast<SessionStorageNamespaceImpl*>(session_storage_namespace));
 }
 
-WebContents* WebContents::FromRenderViewHost(RenderViewHost* rvh) {
+WebContents* WebContents::FromRenderViewHost(const RenderViewHost* rvh) {
   return rvh->GetDelegate()->GetAsWebContents();
 }
 
 }
 
 // WebContentsImpl -------------------------------------------------------------
 
 WebContentsImpl::WebContentsImpl(
     content::BrowserContext* browser_context,
     SiteInstance* site_instance,
@@ skipping 23 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_INVALID),
       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);
     view_.reset(CreateWebContentsView(this, delegate));
@@ skipping 319 matching lines @@
 }
 
 const NavigationController& WebContentsImpl::GetController() const {
   return controller_;
 }
 
 content::BrowserContext* WebContentsImpl::GetBrowserContext() const {
   return controller_.GetBrowserContext();
 }
 
-void WebContentsImpl::SetViewType(content::ViewType type) {
-  view_type_ = type;
-}
-
-content::ViewType WebContentsImpl::GetViewType() const {
-  return view_type_;
-}
-
 const GURL& WebContentsImpl::GetURL() const {
   // We may not have a navigation entry yet
   NavigationEntry* entry = controller_.GetActiveEntry();
   return entry ? entry->GetVirtualURL() : GURL::EmptyGURL();
 }
 
 
 const base::PropertyBag* WebContentsImpl::GetPropertyBag() const {
   return &property_bag_;
 }
@@ skipping 1396 matching lines @@
 
 content::RendererPreferences WebContentsImpl::GetRendererPrefs(
     content::BrowserContext* browser_context) const {
   return renderer_preferences_;
 }
 
 WebContents* WebContentsImpl::GetAsWebContents() {
   return this;
 }
 
-content::ViewType WebContentsImpl::GetRenderViewType() const {
-  return view_type_;
-}
-
 gfx::Rect WebContentsImpl::GetRootWindowResizerRect() const {
   if (delegate_)
     return delegate_->GetRootWindowResizerRect();
   return gfx::Rect();
 }
 
 void WebContentsImpl::RenderViewCreated(RenderViewHost* render_view_host) {
   // Don't send notifications if we are just creating a swapped-out RVH for
   // the opener chain.  These won't be used for view-source or WebUI, so it's
   // ok to return early.
@@ skipping 723 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());
 }