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

Side by Side Diff: apps/app_restore_service.cc

Issue 46853004: Move ExtensionPrefs and friends to extensions/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and update app_shell Created 6 years, 11 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
« no previous file with comments | « apps/app_load_service_factory.cc ('k') | apps/app_restore_service_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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"
16 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
17 #include "chrome/browser/extensions/extension_system.h" 16 #include "chrome/browser/extensions/extension_system.h"
18 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "extensions/browser/extension_prefs.h"
19 #include "extensions/common/extension.h" 19 #include "extensions/common/extension.h"
20 #include "extensions/common/extension_set.h" 20 #include "extensions/common/extension_set.h"
21 21
22 #if defined(OS_WIN) 22 #if defined(OS_WIN)
23 #include "win8/util/win8_util.h" 23 #include "win8/util/win8_util.h"
24 #endif 24 #endif
25 25
26 using extensions::Extension; 26 using extensions::Extension;
27 using extensions::ExtensionHost; 27 using extensions::ExtensionHost;
28 using extensions::ExtensionPrefs; 28 using extensions::ExtensionPrefs;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 void AppRestoreService::StopObservingAppLifetime() { 152 void AppRestoreService::StopObservingAppLifetime() {
153 AppLifetimeMonitor* app_lifetime_monitor = 153 AppLifetimeMonitor* app_lifetime_monitor =
154 AppLifetimeMonitorFactory::GetForProfile(profile_); 154 AppLifetimeMonitorFactory::GetForProfile(profile_);
155 // This might be NULL in tests. 155 // This might be NULL in tests.
156 if (app_lifetime_monitor) 156 if (app_lifetime_monitor)
157 app_lifetime_monitor->RemoveObserver(this); 157 app_lifetime_monitor->RemoveObserver(this);
158 } 158 }
159 159
160 } // namespace apps 160 } // namespace apps
OLDNEW
« no previous file with comments | « apps/app_load_service_factory.cc ('k') | apps/app_restore_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698