summaryrefslogtreecommitdiffstats
path: root/apps/app_lifetime_monitor.h
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.h
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.h')
-rw-r--r--apps/app_lifetime_monitor.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/app_lifetime_monitor.h b/apps/app_lifetime_monitor.h
index bc46e0e..9dfee75 100644
--- a/apps/app_lifetime_monitor.h
+++ b/apps/app_lifetime_monitor.h
@@ -8,11 +8,11 @@
#include <string>
#include <vector>
-#include "apps/app_window_registry.h"
#include "base/observer_list.h"
#include "components/keyed_service/core/keyed_service.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
+#include "extensions/browser/app_window/app_window_registry.h"
namespace extensions {
class Extension;
@@ -26,7 +26,7 @@ namespace apps {
// events.
class AppLifetimeMonitor : public KeyedService,
public content::NotificationObserver,
- public AppWindowRegistry::Observer {
+ public extensions::AppWindowRegistry::Observer {
public:
class Observer {
public:
@@ -60,15 +60,15 @@ class AppLifetimeMonitor : public KeyedService,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // AppWindowRegistry::Observer overrides:
- virtual void OnAppWindowRemoved(AppWindow* app_window) OVERRIDE;
- virtual void OnAppWindowHidden(apps::AppWindow* app_window) OVERRIDE;
- virtual void OnAppWindowShown(apps::AppWindow* app_window) OVERRIDE;
+ // extensions::AppWindowRegistry::Observer overrides:
+ virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE;
+ virtual void OnAppWindowHidden(extensions::AppWindow* app_window) OVERRIDE;
+ virtual void OnAppWindowShown(extensions::AppWindow* app_window) OVERRIDE;
// KeyedService overrides:
virtual void Shutdown() OVERRIDE;
- bool HasVisibleAppWindows(apps::AppWindow* app_window) const;
+ bool HasVisibleAppWindows(extensions::AppWindow* app_window) const;
void NotifyAppStart(const std::string& app_id);
void NotifyAppActivated(const std::string& app_id);