| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| index 6a0cfd173b2c2ef47e5d794172b04aff1990213f..8b519e80bf37d4f98876a658185a196e878705fc 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| @@ -13,6 +13,7 @@
|
| #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"
|
| @@ -453,9 +454,9 @@ extensions::ExtensionPrefs::LaunchType ChromeLauncherController::GetLaunchType(
|
|
|
| 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);
|
| }
|
|
|
| std::string ChromeLauncherController::GetAppID(TabContents* tab) {
|
| @@ -527,8 +528,9 @@ void ChromeLauncherController::SetLaunchType(
|
| 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) {
|
| @@ -671,7 +673,8 @@ void ChromeLauncherController::SetRefocusURLPattern(
|
|
|
| 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) {
|
|
|