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

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

Issue 204983020: Remove ExtensionService Garbage-Collecting methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove lazy global empty delta Created 6 years, 9 months 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_garbage_collector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ed7f799e65c149baefc152b8095f325ceef88648..7219e5b3beefab405b0361494ce4d62bd42e838c 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/chromeos/policy/app_pack_updater.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/extensions/extension_garbage_collector.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/sandboxed_unpacker.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
@@ -109,7 +110,7 @@ void ScreensaverUnpackerClient::LoadScreensaverExtension(
// TODO(rkc): This is a HACK, please remove this method from extension
// service once this code is deprecated. See crbug.com/280363
if (service)
- service->disable_garbage_collection();
+ service->garbage_collector()->disable_garbage_collection();
std::string error;
scoped_refptr<Extension> screensaver_extension =
@@ -177,7 +178,7 @@ KioskModeScreensaver::~KioskModeScreensaver() {
// TODO(rkc): This is a HACK, please remove this method from extension
// service once this code is deprecated. See crbug.com/280363
if (service)
- service->enable_garbage_collection();
+ service->garbage_collector()->enable_garbage_collection();
// Delete it.
content::BrowserThread::PostTask(
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_garbage_collector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698