OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" | 5 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" |
6 | 6 |
7 #include "ash/screensaver/screensaver_view.h" | 7 #include "ash/screensaver/screensaver_view.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/wm/user_activity_detector.h" | 9 #include "ash/wm/user_activity_detector.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 const base::FilePath& extension_base_path, | 93 const base::FilePath& extension_base_path, |
94 const base::FilePath& screensaver_extension_path) { | 94 const base::FilePath& screensaver_extension_path) { |
95 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); | 95 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); |
96 | 96 |
97 std::string error; | 97 std::string error; |
98 scoped_refptr<Extension> screensaver_extension = | 98 scoped_refptr<Extension> screensaver_extension = |
99 extension_file_util::LoadExtension(screensaver_extension_path, | 99 extension_file_util::LoadExtension(screensaver_extension_path, |
100 extensions::Manifest::COMPONENT, | 100 extensions::Manifest::COMPONENT, |
101 Extension::NO_FLAGS, | 101 Extension::NO_FLAGS, |
102 &error); | 102 &error); |
103 if (!screensaver_extension) { | 103 if (!screensaver_extension.get()) { |
104 LOG(ERROR) << "Could not load screensaver extension from: " | 104 LOG(ERROR) << "Could not load screensaver extension from: " |
105 << screensaver_extension_path.value() << " due to: " << error; | 105 << screensaver_extension_path.value() << " due to: " << error; |
106 NotifyAppPackOfDamagedFile(); | 106 NotifyAppPackOfDamagedFile(); |
107 return; | 107 return; |
108 } | 108 } |
109 | 109 |
110 content::BrowserThread::PostTask( | 110 content::BrowserThread::PostTask( |
111 content::BrowserThread::UI, | 111 content::BrowserThread::UI, |
112 FROM_HERE, | 112 FROM_HERE, |
113 base::Bind( | 113 base::Bind( |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 | 214 |
215 // If the user is already logged in, don't need to display the screensaver. | 215 // If the user is already logged in, don't need to display the screensaver. |
216 if (chromeos::LoginState::Get()->IsUserLoggedIn()) | 216 if (chromeos::LoginState::Get()->IsUserLoggedIn()) |
217 return; | 217 return; |
218 | 218 |
219 ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this); | 219 ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this); |
220 | 220 |
221 Profile* default_profile = ProfileManager::GetDefaultProfile(); | 221 Profile* default_profile = ProfileManager::GetDefaultProfile(); |
222 // Add the extension to the extension service and display the screensaver. | 222 // Add the extension to the extension service and display the screensaver. |
223 if (default_profile) { | 223 if (default_profile) { |
224 extensions::ExtensionSystem::Get(default_profile)->extension_service()-> | 224 extensions::ExtensionSystem::Get(default_profile)->extension_service() |
225 AddExtension(extension); | 225 ->AddExtension(extension.get()); |
226 ash::ShowScreensaver( | 226 ash::ShowScreensaver( |
227 extensions::AppLaunchInfo::GetFullLaunchURL(extension)); | 227 extensions::AppLaunchInfo::GetFullLaunchURL(extension.get())); |
228 } else { | 228 } else { |
229 LOG(ERROR) << "Couldn't get default profile. Unable to load screensaver!"; | 229 LOG(ERROR) << "Couldn't get default profile. Unable to load screensaver!"; |
230 ShutdownKioskModeScreensaver(); | 230 ShutdownKioskModeScreensaver(); |
231 } | 231 } |
232 } | 232 } |
233 | 233 |
234 void KioskModeScreensaver::OnUserActivity() { | 234 void KioskModeScreensaver::OnUserActivity() { |
235 // We don't want to handle further user notifications; we'll either login | 235 // We don't want to handle further user notifications; we'll either login |
236 // the user and close out or or at least close the screensaver. | 236 // the user and close out or or at least close the screensaver. |
237 ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this); | 237 ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 | 274 |
275 g_kiosk_mode_screensaver = new KioskModeScreensaver(); | 275 g_kiosk_mode_screensaver = new KioskModeScreensaver(); |
276 } | 276 } |
277 | 277 |
278 void ShutdownKioskModeScreensaver() { | 278 void ShutdownKioskModeScreensaver() { |
279 delete g_kiosk_mode_screensaver; | 279 delete g_kiosk_mode_screensaver; |
280 g_kiosk_mode_screensaver = NULL; | 280 g_kiosk_mode_screensaver = NULL; |
281 } | 281 } |
282 | 282 |
283 } // namespace chromeos | 283 } // namespace chromeos |
OLD | NEW |