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

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

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 years, 8 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
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
12 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 11 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
13 #include "chrome/browser/chromeos/login/existing_user_controller.h" 12 #include "chrome/browser/chromeos/login/existing_user_controller.h"
14 #include "chrome/browser/chromeos/login/user_manager.h" 13 #include "chrome/browser/chromeos/login/user_manager.h"
15 #include "chrome/browser/chromeos/ui/screensaver_extension_dialog.h" 14 #include "chrome/browser/chromeos/ui/screensaver_extension_dialog.h"
16 #include "chrome/browser/extensions/sandboxed_extension_unpacker.h" 15 #include "chrome/browser/extensions/sandboxed_extension_unpacker.h"
17 #include "chrome/common/chrome_notification_types.h" 16 #include "chrome/common/chrome_notification_types.h"
18 #include "chrome/common/extensions/extension.h" 17 #include "chrome/common/extensions/extension.h"
19 #include "chrome/common/extensions/extension_file_util.h" 18 #include "chrome/common/extensions/extension_file_util.h"
19 #include "chromeos/dbus/dbus_thread_manager.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/public/browser/notification_service.h" 21 #include "content/public/browser/notification_service.h"
22 22
23 namespace chromeos { 23 namespace chromeos {
24 24
25 typedef base::Callback<void( 25 typedef base::Callback<void(
26 scoped_refptr<Extension>, 26 scoped_refptr<Extension>,
27 const FilePath&)> UnpackCallback; 27 const FilePath&)> UnpackCallback;
28 28
29 class ScreensaverUnpackerClient : public SandboxedExtensionUnpackerClient { 29 class ScreensaverUnpackerClient : public SandboxedExtensionUnpackerClient {
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 217
218 g_kiosk_mode_screensaver = new KioskModeScreensaver(); 218 g_kiosk_mode_screensaver = new KioskModeScreensaver();
219 } 219 }
220 220
221 void ShutdownKioskModeScreensaver() { 221 void ShutdownKioskModeScreensaver() {
222 delete g_kiosk_mode_screensaver; 222 delete g_kiosk_mode_screensaver;
223 g_kiosk_mode_screensaver = NULL; 223 g_kiosk_mode_screensaver = NULL;
224 } 224 }
225 225
226 } // namespace chromeos 226 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698