Remove GetExtensionService from Profile.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.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/ash/launcher/chrome_launcher_controller.h"
 
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/values.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/app_sync_ui_state.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/extension_utils.h"
 #include "chrome/browser/ui/ash/launcher/launcher_app_icon_loader.h"
 #include "chrome/browser/ui/ash/launcher/launcher_app_tab_helper.h"
@@ skipping 420 matching lines @@
 
   LaunchApp(app_id, event_flags);
 }
 
 extensions::ExtensionPrefs::LaunchType ChromeLauncherController::GetLaunchType(
     ash::LauncherID id) {
   DCHECK(HasItemController(id));
 
   const Extension* extension = GetExtensionForAppID(
       id_to_item_controller_map_[id]->app_id());
-  return profile_->GetExtensionService()->extension_prefs()->GetLaunchType(
-      extension,
-      extensions::ExtensionPrefs::LAUNCH_DEFAULT);
+  return extensions::ExtensionSystem::Get(profile_)->extension_service()->
+      extension_prefs()->GetLaunchType(extension,
+          extensions::ExtensionPrefs::LAUNCH_DEFAULT);

[Yoyo Zhou, 2012/11/21 00:27:13]

nit: indent

[Miranda Callahan, 2012/11/26 22:14:24]

Done.

 }
 
 std::string ChromeLauncherController::GetAppID(TabContents* tab) {
   return app_tab_helper_->GetAppID(tab);
 }
 
 ash::LauncherID ChromeLauncherController::GetLauncherIDForAppID(
     const std::string& app_id) {
   for (IDToItemControllerMap::const_iterator i =
            id_to_item_controller_map_.begin();
@@ skipping 51 matching lines @@
   else
     NOTREACHED();
 }
 
 void ChromeLauncherController::SetLaunchType(
     ash::LauncherID id,
     extensions::ExtensionPrefs::LaunchType launch_type) {
   if (!HasItemController(id))
     return;
 
-  return profile_->GetExtensionService()->extension_prefs()->SetLaunchType(
-      id_to_item_controller_map_[id]->app_id(), launch_type);
+  return extensions::ExtensionSystem::Get(profile_)->extension_service()->
+      extension_prefs()->SetLaunchType(id_to_item_controller_map_[id]->app_id(),
+                                       launch_type);
 }
 
 void ChromeLauncherController::UnpinAppsWithID(const std::string& app_id) {
   if (CanPin())
     DoUnpinAppsWithID(app_id);
   else
     NOTREACHED();
 }
 
 bool ChromeLauncherController::IsLoggedInAsGuest() {
@@ skipping 122 matching lines @@
     AppShortcutLauncherItemController* app_controller =
         static_cast<AppShortcutLauncherItemController*>(controller);
     app_controller->set_refocus_url(url);
   } else {
     NOTREACHED() << "Invalid launcher type";
   }
 }
 
 const Extension* ChromeLauncherController::GetExtensionForAppID(
     const std::string& app_id) {
-  return profile_->GetExtensionService()->GetInstalledExtension(app_id);
+  return extensions::ExtensionSystem::Get(profile_)->extension_service()->
+      GetInstalledExtension(app_id);
 }
 
 void ChromeLauncherController::OnBrowserShortcutClicked(int event_flags) {
   if (event_flags & ui::EF_CONTROL_DOWN) {
     CreateNewWindow();
     return;
   }
 
   Browser* last_browser = browser::FindTabbedBrowser(
       GetProfileForNewWindows(), true, chrome::HOST_DESKTOP_TYPE_ASH);
@@ skipping 388 matching lines @@
       new AppShortcutLauncherItemController(app_id, this);
   ash::LauncherID launcher_id = InsertAppLauncherItem(
       controller, app_id, ash::STATUS_CLOSED, index);
   return launcher_id;
 }
 
 bool ChromeLauncherController::HasItemController(ash::LauncherID id) const {
   return id_to_item_controller_map_.find(id) !=
          id_to_item_controller_map_.end();
 }