Move ExtensionService::GetExtensionById() to ExtensionRegistry

chrome/browser/ui/extensions/application_launch.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/ui/extensions/application_launch.h"
 
 #include <string>
 
 #include "apps/launcher.h"
 #include "base/command_line.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/renderer_preferences.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/ui/browser_commands_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include "win8/util/win8_util.h"
 #endif
 
 using content::WebContents;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
+using extensions::ExtensionRegistry;
 
 namespace {
 
 // Attempts to launch a packaged app, prompting the user to enable it if
 // necessary. If a prompt is required it will be shown inside the AppList.
 // This class manages its own lifetime.
 class EnableViaAppListFlow : public ExtensionEnableFlowDelegate {
  public:
   EnableViaAppListFlow(ExtensionService* service,
                        Profile* profile,
@@ skipping 44 matching lines @@
   std::string extension_id_;
   base::Closure callback_;
   scoped_ptr<ExtensionEnableFlow> flow_;
 
   DISALLOW_COPY_AND_ASSIGN(EnableViaAppListFlow);
 };
 
 const Extension* GetExtension(const AppLaunchParams& params) {
   if (params.extension_id.empty())
     return NULL;
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(params.profile)->extension_service();
-  const Extension* extension = service->GetExtensionById(
-      params.extension_id,
-      ExtensionService::INCLUDE_ENABLED | ExtensionService::INCLUDE_DISABLED |
-          ExtensionService::INCLUDE_TERMINATED);
-  if (!extension)
-    extension = service->GetTerminatedExtension(params.extension_id);
-  return extension;
+  ExtensionRegistry* registry = ExtensionRegistry::Get(params.profile);
+  return registry->GetExtensionById(params.extension_id,
+                                    ExtensionRegistry::ENABLED |
+                                        ExtensionRegistry::DISABLED |
+                                        ExtensionRegistry::TERMINATED);
 }
 
 // Get the launch URL for a given extension, with optional override/fallback.
 // |override_url|, if non-empty, will be preferred over the extension's
 // launch url.
 GURL UrlForExtension(const Extension* extension,
                      const GURL& override_url) {
   if (!extension)
     return override_url;
 
@@ skipping 365 matching lines @@
   // up in LoadingStateChanged to schedule a GetApplicationInfo. And when
   // the web app info is available, extensions::TabHelper notifies Browser via
   // OnDidGetApplicationInfo, which calls
   // web_app::UpdateShortcutForTabContents when it sees UPDATE_SHORTCUT as
   // pending web app action.
   extensions::TabHelper::FromWebContents(tab)->set_pending_web_app_action(
       extensions::TabHelper::UPDATE_SHORTCUT);
 
   return tab;
 }