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

chrome/renderer/extensions/extension_helper.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 "chrome/renderer/extensions/extension_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_view_type.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/common/view_type.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/extension_dispatcher.h"
 #include "chrome/renderer/extensions/miscellaneous_bindings.h"
 #include "chrome/renderer/extensions/user_script_scheduler.h"
 #include "chrome/renderer/extensions/user_script_slave.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
@@ skipping 23 matching lines @@
     LAZY_INSTANCE_INITIALIZER;
 
 // A RenderViewVisitor class that iterates through the set of available
 // views, looking for a view of the given type, in the given browser window
 // and within the given extension.
 // Used to accumulate the list of views associated with an extension.
 class ExtensionViewAccumulator : public content::RenderViewVisitor {
  public:
   ExtensionViewAccumulator(const std::string& extension_id,
                            int browser_window_id,
-                           content::ViewType view_type)
+                           chrome::ViewType view_type)
       : extension_id_(extension_id),
         browser_window_id_(browser_window_id),
         view_type_(view_type) {
   }
 
   std::vector<content::RenderView*> views() { return views_; }
 
   // Returns false to terminate the iteration.
   virtual bool Visit(content::RenderView* render_view) {
     ExtensionHelper* helper = ExtensionHelper::Get(render_view);
@@ skipping 14 matching lines @@
 
     views_.push_back(render_view);
 
     if (view_type_ == chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE)
       return false;  // There can be only one...
     return true;
   }
 
  private:
   // Returns true if |type| "isa" |match|.
-  static bool ViewTypeMatches(content::ViewType type, content::ViewType match) {
+  static bool ViewTypeMatches(chrome::ViewType type, chrome::ViewType match) {
     if (type == match)
       return true;
 
     // INVALID means match all.
-    if (match == content::VIEW_TYPE_INVALID)
+    if (match == chrome::VIEW_TYPE_INVALID)
       return true;
 
     return false;
   }
 
   std::string extension_id_;
   int browser_window_id_;
-  content::ViewType view_type_;
+  chrome::ViewType view_type_;
   std::vector<content::RenderView*> views_;
 };
 
 }
 
 // static
 std::vector<content::RenderView*> ExtensionHelper::GetExtensionViews(
     const std::string& extension_id,
     int browser_window_id,
-    content::ViewType view_type) {
+    chrome::ViewType view_type) {
   ExtensionViewAccumulator accumulator(
       extension_id, browser_window_id, view_type);
   content::RenderView::ForEach(&accumulator);
   return accumulator.views();
 }
 
 // static
 content::RenderView* ExtensionHelper::GetBackgroundPage(
     const std::string& extension_id) {
   ExtensionViewAccumulator accumulator(
       extension_id, extension_misc::kUnknownWindowId,
       chrome::VIEW_TYPE_EXTENSION_BACKGROUND_PAGE);
   content::RenderView::ForEach(&accumulator);
   CHECK_LE(accumulator.views().size(), 1u);
   if (accumulator.views().size() == 0)
     return NULL;
   return accumulator.views()[0];
 }
 
 ExtensionHelper::ExtensionHelper(content::RenderView* render_view,
                                  ExtensionDispatcher* extension_dispatcher)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<ExtensionHelper>(render_view),
       extension_dispatcher_(extension_dispatcher),
       pending_app_icon_requests_(0),
-      view_type_(content::VIEW_TYPE_INVALID),
+      view_type_(chrome::VIEW_TYPE_INVALID),
       browser_window_id_(-1) {
 }
 
 ExtensionHelper::~ExtensionHelper() {
 }
 
 bool ExtensionHelper::InstallWebApplicationUsingDefinitionFile(
     WebFrame* frame, string16* error) {
   // There is an issue of drive-by installs with the below implementation. A web
   // site could force a user to install an app by timing the dialog to come up
@@ skipping 205 matching lines @@
     if (app_info.icons[i].url.SchemeIs(chrome::kDataScheme)) {
       app_info.icons.erase(app_info.icons.begin() + i);
       --i;
     }
   }
 
   Send(new ExtensionHostMsg_DidGetApplicationInfo(
       routing_id(), page_id, app_info));
 }
 
-void ExtensionHelper::OnNotifyRendererViewType(content::ViewType type) {
+void ExtensionHelper::OnNotifyRendererViewType(chrome::ViewType type) {
   view_type_ = type;
 }
 
 void ExtensionHelper::OnUpdateBrowserWindowId(int window_id) {
   browser_window_id_ = window_id;
 }
 
 void ExtensionHelper::DidDownloadApplicationDefinition(
     const WebKit::WebURLResponse& response,
     const std::string& data) {
@@ skipping 86 matching lines @@
       routing_id(), *pending_app_info_));
   pending_app_info_.reset(NULL);
 }
 
 void ExtensionHelper::AddErrorToRootConsole(const string16& message) {
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     render_view()->GetWebView()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }