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

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

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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
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 d9ace4b73582121a5633ff2f6db5b09a3bf9c145..000287a4965cda89a72e5c4dbcd910a084386b61 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
@@ -100,7 +100,7 @@ void ScreensaverUnpackerClient::LoadScreensaverExtension(
extensions::Manifest::COMPONENT,
Extension::NO_FLAGS,
&error);
- if (!screensaver_extension) {
+ if (!screensaver_extension.get()) {
LOG(ERROR) << "Could not load screensaver extension from: "
<< screensaver_extension_path.value() << " due to: " << error;
NotifyAppPackOfDamagedFile();
@@ -221,10 +221,10 @@ void KioskModeScreensaver::SetupScreensaver(
Profile* default_profile = ProfileManager::GetDefaultProfile();
// Add the extension to the extension service and display the screensaver.
if (default_profile) {
- extensions::ExtensionSystem::Get(default_profile)->extension_service()->
- AddExtension(extension);
+ extensions::ExtensionSystem::Get(default_profile)->extension_service()
+ ->AddExtension(extension.get());
ash::ShowScreensaver(
- extensions::AppLaunchInfo::GetFullLaunchURL(extension));
+ extensions::AppLaunchInfo::GetFullLaunchURL(extension.get()));
} else {
LOG(ERROR) << "Couldn't get default profile. Unable to load screensaver!";
ShutdownKioskModeScreensaver();
« no previous file with comments | « chrome/browser/chromeos/imageburner/burn_manager.cc ('k') | chrome/browser/chromeos/login/login_performer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698