Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6073)

Unified Diff: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: tweaks Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5edee1a264a7b5b2d404018f1e1b46c07adfb6a3..1e5e5a45c108013445daf76528fadf3b6185b091 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!";

Powered by Google App Engine
This is Rietveld 408576698