| Index: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
|
| diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
|
| index 0c83c0108494e66ba7df5971c8c6bd28726704be..2d6fe81df75449944409a04239d3f09f5454c1ac 100644
|
| --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
|
| +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| #include "chrome/browser/chromeos/login/webui_login_display_host.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| +#include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/extensions/sandboxed_unpacker.h"
|
| #include "chrome/browser/policy/app_pack_updater.h"
|
| #include "chrome/browser/policy/browser_policy_connector.h"
|
| @@ -179,8 +180,8 @@ void KioskModeScreensaver::ScreensaverPathCallback(
|
| Profile* default_profile = ProfileManager::GetDefaultProfile();
|
| if (!default_profile)
|
| return;
|
| - FilePath extensions_dir =
|
| - default_profile->GetExtensionService()->install_directory();
|
| + FilePath extensions_dir = extensions::ExtensionSystem::Get(default_profile)->
|
| + extension_service()->install_directory();
|
| scoped_refptr<SandboxedUnpacker> screensaver_unpacker(
|
| new SandboxedUnpacker(
|
| screensaver_crx,
|
| @@ -219,7 +220,8 @@ void KioskModeScreensaver::SetupScreensaver(
|
| Profile* default_profile = ProfileManager::GetDefaultProfile();
|
| // Add the extension to the extension service and display the screensaver.
|
| if (default_profile) {
|
| - default_profile->GetExtensionService()->AddExtension(extension);
|
| + extensions::ExtensionSystem::Get(default_profile)->extension_service()->
|
| + AddExtension(extension);
|
| ash::ShowScreensaver(extension->GetFullLaunchURL());
|
| } else {
|
| LOG(ERROR) << "Couldn't get default profile. Unable to load screensaver!";
|
|
|