apps/app_restore_service.cc - Issue 89253002: Remove ExtensionPrefFactory's dependency on Profile.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: apps/app_restore_service.cc

Issue 89253002: Remove ExtensionPrefFactory's dependency on Profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 7 years 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 | « no previous file | apps/app_restore_service_browsertest.cc » ('j') | no next file with comments »

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 "apps/app_restore_service.h"	5 #include "apps/app_restore_service.h"

6	6

7 #include "apps/app_lifetime_monitor_factory.h"	7 #include "apps/app_lifetime_monitor_factory.h"

8 #include "apps/app_restore_service_factory.h"	8 #include "apps/app_restore_service_factory.h"

9 #include "apps/launcher.h"	9 #include "apps/launcher.h"

10 #include "apps/saved_files_service.h"	10 #include "apps/saved_files_service.h"

11 #include "apps/shell_window.h"	11 #include "apps/shell_window.h"

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

13 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"	13 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"

14 #include "chrome/browser/extensions/extension_host.h"	14 #include "chrome/browser/extensions/extension_host.h"

15 #include "chrome/browser/extensions/extension_prefs.h"	15 #include "chrome/browser/extensions/extension_prefs.h"

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

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

	18 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/common/extensions/extension_set.h"	19 #include "chrome/common/extensions/extension_set.h"

19 #include "extensions/common/extension.h"	20 #include "extensions/common/extension.h"

20	21

21 #if defined(OS_WIN)	22 #if defined(OS_WIN)

22 #include "win8/util/win8_util.h"	23 #include "win8/util/win8_util.h"

23 #endif	24 #endif

24	25

25 using extensions::Extension;	26 using extensions::Extension;

26 using extensions::ExtensionHost;	27 using extensions::ExtensionHost;

27 using extensions::ExtensionPrefs;	28 using extensions::ExtensionPrefs;

(...skipping 122 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
150	151

151 void AppRestoreService::StopObservingAppLifetime() {	152 void AppRestoreService::StopObservingAppLifetime() {

152 AppLifetimeMonitor* app_lifetime_monitor =	153 AppLifetimeMonitor* app_lifetime_monitor =

153 AppLifetimeMonitorFactory::GetForProfile(profile_);	154 AppLifetimeMonitorFactory::GetForProfile(profile_);

154 // This might be NULL in tests.	155 // This might be NULL in tests.

155 if (app_lifetime_monitor)	156 if (app_lifetime_monitor)

156 app_lifetime_monitor->RemoveObserver(this);	157 app_lifetime_monitor->RemoveObserver(this);

157 }	158 }

158	159

159 } // namespace apps	160 } // namespace apps

OLD	NEW