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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
137 chromeos::KioskModeSettings::Get()->GetScreensaverPath( | 137 chromeos::KioskModeSettings::Get()->GetScreensaverPath( |
138 base::Bind(&KioskModeScreensaver::ScreensaverPathCallback, | 138 base::Bind(&KioskModeScreensaver::ScreensaverPathCallback, |
139 weak_ptr_factory_.GetWeakPtr())); | 139 weak_ptr_factory_.GetWeakPtr())); |
140 } | 140 } |
141 | 141 |
142 void KioskModeScreensaver::ScreensaverPathCallback( | 142 void KioskModeScreensaver::ScreensaverPathCallback( |
143 const FilePath& screensaver_crx) { | 143 const FilePath& screensaver_crx) { |
144 if (screensaver_crx.empty()) | 144 if (screensaver_crx.empty()) |
145 return; | 145 return; |
146 | 146 |
147 Profile* default_profile = ProfileManager::GetDefaultProfile(); | |
148 if (!default_profile) | |
149 return; | |
150 FilePath all_extensions_dir = | |
Aaron Boodman
2012/10/18 21:11:12
kinda funny name. extensions_dir? extensions_insta
| |
151 default_profile->GetExtensionService()->install_directory(); | |
147 scoped_refptr<SandboxedUnpacker> screensaver_unpacker( | 152 scoped_refptr<SandboxedUnpacker> screensaver_unpacker( |
148 new SandboxedUnpacker( | 153 new SandboxedUnpacker( |
149 screensaver_crx, | 154 screensaver_crx, |
150 true, | 155 true, |
151 Extension::COMPONENT, | 156 Extension::COMPONENT, |
152 Extension::NO_FLAGS, | 157 Extension::NO_FLAGS, |
158 all_extensions_dir, | |
153 new ScreensaverUnpackerClient(base::Bind( | 159 new ScreensaverUnpackerClient(base::Bind( |
154 &KioskModeScreensaver::SetupScreensaver, | 160 &KioskModeScreensaver::SetupScreensaver, |
155 weak_ptr_factory_.GetWeakPtr())))); | 161 weak_ptr_factory_.GetWeakPtr())))); |
156 | 162 |
157 // Fire off the unpacker on the file thread; don't need it to return. | 163 // Fire off the unpacker on the file thread; don't need it to return. |
158 content::BrowserThread::PostTask( | 164 content::BrowserThread::PostTask( |
159 content::BrowserThread::FILE, | 165 content::BrowserThread::FILE, |
160 FROM_HERE, | 166 FROM_HERE, |
161 base::Bind( | 167 base::Bind( |
162 &SandboxedUnpacker::Start, screensaver_unpacker.get())); | 168 &SandboxedUnpacker::Start, screensaver_unpacker.get())); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
231 | 237 |
232 g_kiosk_mode_screensaver = new KioskModeScreensaver(); | 238 g_kiosk_mode_screensaver = new KioskModeScreensaver(); |
233 } | 239 } |
234 | 240 |
235 void ShutdownKioskModeScreensaver() { | 241 void ShutdownKioskModeScreensaver() { |
236 delete g_kiosk_mode_screensaver; | 242 delete g_kiosk_mode_screensaver; |
237 g_kiosk_mode_screensaver = NULL; | 243 g_kiosk_mode_screensaver = NULL; |
238 } | 244 } |
239 | 245 |
240 } // namespace chromeos | 246 } // namespace chromeos |
OLD | NEW |