chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc - Issue 15239002: Move Extension and PermissionsData to extensions/common.

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

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month 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

« no previous file with comments | « chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

11 #include "base/callback.h"	11 #include "base/callback.h"

12 #include "base/lazy_instance.h"	12 #include "base/lazy_instance.h"

13 #include "base/logging.h"	13 #include "base/logging.h"

14 #include "chrome/browser/browser_process.h"	14 #include "chrome/browser/browser_process.h"

15 #include "chrome/browser/chrome_notification_types.h"	15 #include "chrome/browser/chrome_notification_types.h"

16 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"	16 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"

17 #include "chrome/browser/chromeos/login/existing_user_controller.h"	17 #include "chrome/browser/chromeos/login/existing_user_controller.h"

18 #include "chrome/browser/chromeos/login/login_display_host_impl.h"	18 #include "chrome/browser/chromeos/login/login_display_host_impl.h"

19 #include "chrome/browser/chromeos/policy/app_pack_updater.h"	19 #include "chrome/browser/chromeos/policy/app_pack_updater.h"

20 #include "chrome/browser/extensions/extension_service.h"	20 #include "chrome/browser/extensions/extension_service.h"

21 #include "chrome/browser/extensions/extension_system.h"	21 #include "chrome/browser/extensions/extension_system.h"

22 #include "chrome/browser/extensions/sandboxed_unpacker.h"	22 #include "chrome/browser/extensions/sandboxed_unpacker.h"

23 #include "chrome/browser/policy/browser_policy_connector.h"	23 #include "chrome/browser/policy/browser_policy_connector.h"

24 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"	24 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

25 #include "chrome/common/extensions/extension.h"

26 #include "chrome/common/extensions/extension_file_util.h"	25 #include "chrome/common/extensions/extension_file_util.h"

27 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"	26 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

28 #include "chromeos/login/login_state.h"	27 #include "chromeos/login/login_state.h"

29 #include "content/public/browser/browser_thread.h"	28 #include "content/public/browser/browser_thread.h"

30 #include "content/public/browser/notification_service.h"	29 #include "content/public/browser/notification_service.h"

	30 #include "extensions/common/extension.h"

31	31

32 using extensions::Extension;	32 using extensions::Extension;

33 using extensions::SandboxedUnpacker;	33 using extensions::SandboxedUnpacker;

34	34

35 namespace chromeos {	35 namespace chromeos {

36	36

37 namespace {	37 namespace {

38	38

39 ExtensionService* GetDefaultExtensionService() {	39 ExtensionService* GetDefaultExtensionService() {

40 Profile* default_profile = ProfileManager::GetDefaultProfile();	40 Profile* default_profile = ProfileManager::GetDefaultProfile();

(...skipping 259 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
300	300

301 g_kiosk_mode_screensaver = new KioskModeScreensaver();	301 g_kiosk_mode_screensaver = new KioskModeScreensaver();

302 }	302 }

303	303

304 void ShutdownKioskModeScreensaver() {	304 void ShutdownKioskModeScreensaver() {

305 delete g_kiosk_mode_screensaver;	305 delete g_kiosk_mode_screensaver;

306 g_kiosk_mode_screensaver = NULL;	306 g_kiosk_mode_screensaver = NULL;

307 }	307 }

308	308

309 } // namespace chromeos	309 } // namespace chromeos

OLD	NEW