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

content/public/browser/web_contents.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/save_page_type.h"
 #include "content/public/browser/web_ui.h"
-#include "content/public/common/view_type.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 namespace base {
 class PropertyBag;
 class TimeTicks;
 }
 
 namespace gfx {
@@ skipping 32 matching lines @@
   // pass in NULL which will cause a new SessionStorageNamespace to be created.
   CONTENT_EXPORT static WebContents* Create(
       BrowserContext* browser_context,
       SiteInstance* site_instance,
       int routing_id,
       const WebContents* base_web_contents,
       SessionStorageNamespace* session_storage_namespace);
 
   // Returns a WebContents that wraps the RenderViewHost, or NULL if the
   // render view host's delegate isn't a WebContents.
-  CONTENT_EXPORT static WebContents* FromRenderViewHost(RenderViewHost* rvh);
+  CONTENT_EXPORT static WebContents* FromRenderViewHost(
+      const RenderViewHost* rvh);
 
   virtual ~WebContents() {}
 
   // Intrinsic tab state -------------------------------------------------------
 
   // Returns the property bag for this WebContents, where callers can add
   // extra data they may wish to associate with the tab. Returns a pointer
   // rather than a reference since the PropertyAccessors expect this.
   virtual const base::PropertyBag* GetPropertyBag() const = 0;
   virtual base::PropertyBag* GetPropertyBag() = 0;
 
   // Gets/Sets the delegate.
   virtual WebContentsDelegate* GetDelegate() = 0;
   virtual void SetDelegate(WebContentsDelegate* delegate) = 0;
 
   // Gets the controller for this WebContents.
   virtual NavigationController& GetController() = 0;
   virtual const NavigationController& GetController() const = 0;
 
   // Returns the user browser context associated with this WebContents (via the
   // NavigationController).
   virtual content::BrowserContext* GetBrowserContext() const = 0;
 
-  // Allows overriding the type of this tab.
-  virtual void SetViewType(content::ViewType type) = 0;
-  virtual content::ViewType GetViewType() const = 0;
-
   // Gets the URL that is currently being displayed, if there is one.
   virtual const GURL& GetURL() const = 0;
 
   // Return the currently active RenderProcessHost and RenderViewHost. Each of
   // these may change over time.
   virtual RenderProcessHost* GetRenderProcessHost() const = 0;
 
   // Gets the current RenderViewHost for this tab.
   virtual RenderViewHost* GetRenderViewHost() const = 0;
 
@@ skipping 272 matching lines @@
   // Focuses the location bar.
   virtual void SetFocusToLocationBar(bool select_all) = 0;
 
   // Does this have an opener associated with it?
   virtual bool HasOpener() const = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_