summaryrefslogtreecommitdiffstats
path: root/apps/app_lifetime_monitor.cc
diff options
context:
space:
mode:
authorhashimoto <hashimoto@chromium.org>2014-08-29 02:46:57 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-29 09:47:52 +0000
commitad3c6870f41f0b057697ea8dec59cc8cf8108745 (patch)
tree285a8312794c1fad48a95385d3c8d1de73af398b /apps/app_lifetime_monitor.cc
parentfe5226eee8343a325c6b4d5d0e75f94c96c4616e (diff)
downloadchromium_src-ad3c6870f41f0b057697ea8dec59cc8cf8108745.zip
chromium_src-ad3c6870f41f0b057697ea8dec59cc8cf8108745.tar.gz
chromium_src-ad3c6870f41f0b057697ea8dec59cc8cf8108745.tar.bz2
Move AppWindow to extensions
Move AppWindow, AppWindowRegistry and AppsClient from apps/ to extensions/browser/app_window Change the namespace from apps to extensions. Fix GYP and DEPS. BUG=403726 TBR=sky@chromium.org for include and namespace changes Review URL: https://codereview.chromium.org/494033002 Cr-Commit-Position: refs/heads/master@{#292599}
Diffstat (limited to 'apps/app_lifetime_monitor.cc')
-rw-r--r--apps/app_lifetime_monitor.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_lifetime_monitor.cc b/apps/app_lifetime_monitor.cc
index 84b6c82..16323e9 100644
--- a/apps/app_lifetime_monitor.cc
+++ b/apps/app_lifetime_monitor.cc
@@ -4,17 +4,19 @@
#include "apps/app_lifetime_monitor.h"
-#include "apps/app_window.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/profiles/profile.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
+#include "extensions/browser/app_window/app_window.h"
#include "extensions/browser/extension_host.h"
#include "extensions/browser/notification_types.h"
#include "extensions/common/extension.h"
namespace apps {
+using extensions::AppWindow;
+using extensions::AppWindowRegistry;
using extensions::Extension;
using extensions::ExtensionHost;