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

chrome/renderer/extensions/extension_helper.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_RENDERER_EXTENSIONS_EXTENSION_HELPER_H_
 #define CHROME_RENDERER_EXTENSIONS_EXTENSION_HELPER_H_
 #pragma once
 
 #include <map>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
+#include "chrome/common/view_type.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_observer_tracker.h"
-#include "content/public/common/view_type.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
 
 class ExtensionDispatcher;
 class GURL;
 class SkBitmap;
 struct ExtensionMsg_ExecuteCode_Params;
 struct WebApplicationInfo;
 
 namespace base {
 class ListValue;
 }
 
 namespace webkit_glue {
 class ResourceFetcher;
 class ImageResourceFetcher;
 }
 
 // RenderView-level plumbing for extension features.
 class ExtensionHelper
     : public content::RenderViewObserver,
       public content::RenderViewObserverTracker<ExtensionHelper> {
  public:
   // Returns a list of extension RenderViews that match the given filter
   // criteria. If |browser_window_id| is not extension_misc::kUnknownWindowId,
   // the list is restricted to views in that browser window.
   static std::vector<content::RenderView*> GetExtensionViews(
       const std::string& extension_id,
       int browser_window_id,
-      content::ViewType view_type);
+      chrome::ViewType view_type);
 
   // Returns the given extension's background page, or NULL if none.
   static content::RenderView* GetBackgroundPage(
       const std::string& extension_id);
 
   ExtensionHelper(content::RenderView* render_view,
                   ExtensionDispatcher* extension_dispatcher);
   virtual ~ExtensionHelper();
 
   // Starts installation of the page in the specified frame as a web app. The
   // page must link to an external 'definition file'. This is different from
   // the 'application shortcuts' feature where we pull the application
   // definition out of optional meta tags in the page.
   bool InstallWebApplicationUsingDefinitionFile(WebKit::WebFrame* frame,
                                                 string16* error);
 
   int browser_window_id() const { return browser_window_id_; }
-  content::ViewType view_type() const { return view_type_; }
+  chrome::ViewType view_type() const { return view_type_; }
 
  private:
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidFinishDocumentLoad(WebKit::WebFrame* frame) OVERRIDE;
   virtual void DidFinishLoad(WebKit::WebFrame* frame) OVERRIDE;
   virtual void DidCreateDocumentElement(WebKit::WebFrame* frame) OVERRIDE;
   virtual void DidStartProvisionalLoad(WebKit::WebFrame* frame) OVERRIDE;
   virtual void FrameDetached(WebKit::WebFrame* frame) OVERRIDE;
   virtual void DidCreateDataSource(WebKit::WebFrame* frame,
@@ skipping 10 matching lines @@
   void OnExtensionDispatchOnConnect(int target_port_id,
                                     const std::string& channel_name,
                                     const std::string& tab_json,
                                     const std::string& source_extension_id,
                                     const std::string& target_extension_id);
   void OnExtensionDeliverMessage(int target_port_id,
                                  const std::string& message);
   void OnExtensionDispatchOnDisconnect(int port_id, bool connection_error);
   void OnExecuteCode(const ExtensionMsg_ExecuteCode_Params& params);
   void OnGetApplicationInfo(int page_id);
-  void OnNotifyRendererViewType(content::ViewType view_type);
+  void OnNotifyRendererViewType(chrome::ViewType view_type);
   void OnUpdateBrowserWindowId(int window_id);
 
   // Callback triggered when we finish downloading the application definition
   // file.
   void DidDownloadApplicationDefinition(const WebKit::WebURLResponse& response,
                                         const std::string& data);
 
   // Callback triggered after each icon referenced by the application definition
   // is downloaded.
   void DidDownloadApplicationIcon(webkit_glue::ImageResourceFetcher* fetcher,
@@ skipping 15 matching lines @@
   // Used to download the icons for an application.
   typedef std::vector<linked_ptr<webkit_glue::ImageResourceFetcher> >
       ImageResourceFetcherList;
   ImageResourceFetcherList app_icon_fetchers_;
 
   // The number of app icon requests outstanding. When this reaches zero, we're
   // done processing an app definition file.
   int pending_app_icon_requests_;
 
   // Type of view attached with RenderView.
-  content::ViewType view_type_;
+  chrome::ViewType view_type_;
 
   // Id number of browser window which RenderView is attached to.
   int browser_window_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionHelper);
 };
 
 #endif  // CHROME_RENDERER_EXTENSIONS_EXTENSION_HELPER_H_