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

chrome/browser/extensions/extension_host.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 CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/perftimer.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "content/public/browser/javascript_dialogs.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "content/public/common/view_type.h"
+#include "chrome/common/view_type.h"

[Avi (use Gerrit), 2012/05/23 04:40:35]

alphabetize

[jam, 2012/05/23 05:08:16]

Done.

 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/extensions/extension_view.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #elif defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h"
 #elif defined(OS_ANDROID)
 #include "chrome/browser/ui/android/extensions/extension_view_android.h"
 #endif
@@ skipping 29 matching lines @@
   typedef ExtensionViewMac PlatformExtensionView;
 #elif defined(TOOLKIT_GTK)
   typedef ExtensionViewGtk PlatformExtensionView;
 #elif defined(OS_ANDROID)
   // Android does not support extensions.
   typedef ExtensionViewAndroid PlatformExtensionView;
 #endif
 
   ExtensionHost(const extensions::Extension* extension,
                 content::SiteInstance* site_instance,
-                const GURL& url, content::ViewType host_type);
+                const GURL& url, chrome::ViewType host_type);
   virtual ~ExtensionHost();
 
 #if defined(TOOLKIT_VIEWS)
   void set_view(PlatformExtensionView* view) { view_.reset(view); }
 #endif
 
   const PlatformExtensionView* view() const {
 #if defined(OS_ANDROID)
     NOTREACHED();
 #endif
@@ skipping 18 matching lines @@
   content::WebContents* host_contents() const { return host_contents_.get(); }
   content::RenderViewHost* render_view_host() const;
   content::RenderProcessHost* render_process_host() const;
   bool did_stop_loading() const { return did_stop_loading_; }
   bool document_element_available() const {
     return document_element_available_;
   }
 
   Profile* profile() const { return profile_; }
 
-  content::ViewType extension_host_type() const { return extension_host_type_; }
+  chrome::ViewType extension_host_type() const { return extension_host_type_; }
   const GURL& GetURL() const;
 
   // ExtensionFunctionDispatcher::Delegate
   virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
   void SetAssociatedWebContents(content::WebContents* web_contents);
 
   // Returns true if the render view is initialized and didn't crash.
   bool IsRenderViewLive() const;
 
   // Prepares to initializes our RenderViewHost by creating its RenderView and
@@ skipping 115 matching lines @@
   bool document_element_available_;
 
   // The original URL of the page being hosted.
   GURL initial_url_;
 
   content::NotificationRegistrar registrar_;
 
   ExtensionFunctionDispatcher extension_function_dispatcher_;
 
   // The type of view being hosted.
-  content::ViewType extension_host_type_;
+  chrome::ViewType extension_host_type_;
 
   // The relevant WebContents associated with this ExtensionHost, if any.
   content::WebContents* associated_web_contents_;
 
   // Used to measure how long it's been since the host was created.
   PerfTimer since_created_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionHost);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_HOST_H_