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

Side by Side Diff: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 } 89 }
90 90
91 void ScreensaverUnpackerClient::LoadScreensaverExtension( 91 void ScreensaverUnpackerClient::LoadScreensaverExtension(
92 const FilePath& extension_base_path, 92 const FilePath& extension_base_path,
93 const FilePath& screensaver_extension_path) { 93 const FilePath& screensaver_extension_path) {
94 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)); 94 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
95 95
96 std::string error; 96 std::string error;
97 scoped_refptr<Extension> screensaver_extension = 97 scoped_refptr<Extension> screensaver_extension =
98 extension_file_util::LoadExtension(screensaver_extension_path, 98 extension_file_util::LoadExtension(screensaver_extension_path,
99 Extension::COMPONENT, 99 extensions::Manifest::COMPONENT,
100 Extension::NO_FLAGS, 100 Extension::NO_FLAGS,
101 &error); 101 &error);
102 if (!screensaver_extension) { 102 if (!screensaver_extension) {
103 LOG(ERROR) << "Could not load screensaver extension from: " 103 LOG(ERROR) << "Could not load screensaver extension from: "
104 << screensaver_extension_path.value() << " due to: " << error; 104 << screensaver_extension_path.value() << " due to: " << error;
105 NotifyAppPackOfDamagedFile(); 105 NotifyAppPackOfDamagedFile();
106 return; 106 return;
107 } 107 }
108 108
109 content::BrowserThread::PostTask( 109 content::BrowserThread::PostTask(
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 179
180 Profile* default_profile = ProfileManager::GetDefaultProfile(); 180 Profile* default_profile = ProfileManager::GetDefaultProfile();
181 if (!default_profile) 181 if (!default_profile)
182 return; 182 return;
183 FilePath extensions_dir = extensions::ExtensionSystem::Get(default_profile)-> 183 FilePath extensions_dir = extensions::ExtensionSystem::Get(default_profile)->
184 extension_service()->install_directory(); 184 extension_service()->install_directory();
185 scoped_refptr<SandboxedUnpacker> screensaver_unpacker( 185 scoped_refptr<SandboxedUnpacker> screensaver_unpacker(
186 new SandboxedUnpacker( 186 new SandboxedUnpacker(
187 screensaver_crx, 187 screensaver_crx,
188 true, 188 true,
189 Extension::COMPONENT, 189 extensions::Manifest::COMPONENT,
190 Extension::NO_FLAGS, 190 Extension::NO_FLAGS,
191 extensions_dir, 191 extensions_dir,
192 content::BrowserThread::GetMessageLoopProxyForThread( 192 content::BrowserThread::GetMessageLoopProxyForThread(
193 content::BrowserThread::FILE), 193 content::BrowserThread::FILE),
194 new ScreensaverUnpackerClient( 194 new ScreensaverUnpackerClient(
195 screensaver_crx, 195 screensaver_crx,
196 base::Bind( 196 base::Bind(
197 &KioskModeScreensaver::SetupScreensaver, 197 &KioskModeScreensaver::SetupScreensaver,
198 weak_ptr_factory_.GetWeakPtr())))); 198 weak_ptr_factory_.GetWeakPtr()))));
199 199
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 272
273 g_kiosk_mode_screensaver = new KioskModeScreensaver(); 273 g_kiosk_mode_screensaver = new KioskModeScreensaver();
274 } 274 }
275 275
276 void ShutdownKioskModeScreensaver() { 276 void ShutdownKioskModeScreensaver() {
277 delete g_kiosk_mode_screensaver; 277 delete g_kiosk_mode_screensaver;
278 g_kiosk_mode_screensaver = NULL; 278 g_kiosk_mode_screensaver = NULL;
279 } 279 }
280 280
281 } // namespace chromeos 281 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/extensions/admin_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698