Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854

1 files changed, 6 insertions, 5 deletions

diff --git a/athena/activity/public/activity_factory.h b/athena/activity/public/activity_factory.h
index bc95893e25..cd79ca76b7 100644
--- a/athena/activity/public/activity_factory.h
+++ b/athena/activity/public/activity_factory.h
@@ -8,14 +8,14 @@
 #include "athena/athena_export.h"
 #include "url/gurl.h"
 
-namespace apps {
-class ShellAppWindow;
-}
-
 namespace content {
 class BrowserContext;
 }
 
+namespace extensions {
+class ShellAppWindow;
+}
+
 namespace athena {
 class Activity;
 
@@ -38,7 +38,8 @@ class ATHENA_EXPORT ActivityFactory {
 
   // Create an activity of an app with |app_window|. The returned activity
   // should own |app_window|.
-  virtual Activity* CreateAppActivity(apps::ShellAppWindow* app_window) = 0;
+  virtual Activity* CreateAppActivity(
+      extensions::ShellAppWindow* app_window) = 0;
 };
 
 }  // namespace athena