summaryrefslogtreecommitdiffstats
path: root/apps/app_restore_service.cc
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 01:54:38 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 01:54:38 +0000
commite3a8ebb9866a207a123d7a5f165d35c2f7019b7d (patch)
tree590cb6c1e3af05fceeaab487c041b17e09cf4d66 /apps/app_restore_service.cc
parent64304a7356d23cbbe30cc7a61d2a63cc4de90990 (diff)
downloadchromium_src-e3a8ebb9866a207a123d7a5f165d35c2f7019b7d.zip
chromium_src-e3a8ebb9866a207a123d7a5f165d35c2f7019b7d.tar.gz
chromium_src-e3a8ebb9866a207a123d7a5f165d35c2f7019b7d.tar.bz2
Introduce apps API target in //apps and move app.runtime API into it
This breaks a dependency from //apps onto //chrome, getting us closer to an app_shell build that does not include chrome. * Introduce apps/browser/api and apps/common/api to mirror extensions. * Introduce an apps_api build target. * Hook up schema and function registration in chrome and app_shell. * Move app_runtime_api.h/cc into //apps and switch to apps namespace. * Eliminate AppEventRouter dependencies on Chrome: ** Use ExtensionsBrowserClient to determine if we're in kiosk mode. ** Introduce apps::file_handler_util for GrantedFileEntry (anticipating more code from app_file_handler_util to move there in the future). BUG=357818 TEST=browser_tests *PlatformApp* Review URL: https://codereview.chromium.org/217533006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_restore_service.cc')
-rw-r--r--apps/app_restore_service.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc
index d3d1302..e92fd2c 100644
--- a/apps/app_restore_service.cc
+++ b/apps/app_restore_service.cc
@@ -7,10 +7,10 @@
#include "apps/app_lifetime_monitor_factory.h"
#include "apps/app_restore_service_factory.h"
#include "apps/app_window.h"
+#include "apps/browser/api/app_runtime/app_runtime_api.h"
#include "apps/launcher.h"
#include "apps/saved_files_service.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
#include "chrome/browser/profiles/profile.h"
#include "extensions/browser/extension_host.h"
#include "extensions/browser/extension_prefs.h"