Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

chrome/browser/renderer_host/chrome_render_view_host_observer.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/browser/renderer_host/chrome_render_view_host_observer.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
+#include "chrome/common/extensions/manifest.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "extensions/common/constants.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #endif  // OS_WIN
 
 using content::ChildProcessSecurityPolicy;
 using content::RenderViewHost;
 using content::SiteInstance;
 using extensions::Extension;
+using extensions::Manifest;
 
 ChromeRenderViewHostObserver::ChromeRenderViewHostObserver(
     RenderViewHost* render_view_host, chrome_browser_net::Predictor* predictor)
     : content::RenderViewHostObserver(render_view_host),
       predictor_(predictor) {
   SiteInstance* site_instance = render_view_host->GetSiteInstance();
   profile_ = Profile::FromBrowserContext(
       site_instance->GetBrowserContext());
 
   InitRenderViewForExtensions();
@@ skipping 36 matching lines @@
 }
 
 void ChromeRenderViewHostObserver::InitRenderViewForExtensions() {
   const Extension* extension = GetExtension();
   if (!extension)
     return;
 
   content::RenderProcessHost* process = render_view_host()->GetProcess();
 
   // Some extensions use chrome:// URLs.
-  Extension::Type type = extension->GetType();
-  if (type == Extension::TYPE_EXTENSION ||
-      type == Extension::TYPE_LEGACY_PACKAGED_APP) {
+  Manifest::Type type = extension->GetType();
+  if (type == Manifest::TYPE_EXTENSION ||
+      type == Manifest::TYPE_LEGACY_PACKAGED_APP) {
     ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
         process->GetID(), chrome::kChromeUIScheme);
 
     if (extensions::ExtensionSystem::Get(profile_)->extension_service()->
             extension_prefs()->AllowFileAccess(extension->id())) {
       ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
           process->GetID(), chrome::kFileScheme);
     }
   }
 
   switch (type) {
-    case Extension::TYPE_EXTENSION:
-    case Extension::TYPE_USER_SCRIPT:
-    case Extension::TYPE_HOSTED_APP:
-    case Extension::TYPE_LEGACY_PACKAGED_APP:
-    case Extension::TYPE_PLATFORM_APP:
+    case Manifest::TYPE_EXTENSION:
+    case Manifest::TYPE_USER_SCRIPT:
+    case Manifest::TYPE_HOSTED_APP:
+    case Manifest::TYPE_LEGACY_PACKAGED_APP:
+    case Manifest::TYPE_PLATFORM_APP:
       // Always send a Loaded message before ActivateExtension so that
       // ExtensionDispatcher knows what Extension is active, not just its ID.
       // This is important for classifying the Extension's JavaScript context
       // correctly (see ExtensionDispatcher::ClassifyJavaScriptContext).
       Send(new ExtensionMsg_Loaded(
           std::vector<ExtensionMsg_Loaded_Params>(
               1, ExtensionMsg_Loaded_Params(extension))));
       Send(new ExtensionMsg_ActivateExtension(extension->id()));
       break;
 
-    case Extension::TYPE_UNKNOWN:
-    case Extension::TYPE_THEME:
+    case Manifest::TYPE_UNKNOWN:
+    case Manifest::TYPE_THEME:
       break;
   }
 }
 
 const Extension* ChromeRenderViewHostObserver::GetExtension() {
   // Note that due to ChromeContentBrowserClient::GetEffectiveURL(), hosted apps
   // (excluding bookmark apps) will have a chrome-extension:// URL for their
   // site, so we can ignore that wrinkle here.
   SiteInstance* site_instance = render_view_host()->GetSiteInstance();
   const GURL& site = site_instance->GetSiteURL();
@@ skipping 34 matching lines @@
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_FOCUSED_NODE_TOUCHED,
         content::Source<RenderViewHost>(render_view_host()),
         content::Details<bool>(&editable));
   } else {
 #if defined(OS_WIN)
     base::win::DismissVirtualKeyboard();
 #endif
   }
 }