Move apps/shell to extensions/shell.

athena/main/athena_app_window_controller.h

Index: athena/main/athena_app_window_controller.h
diff --git a/athena/main/athena_app_window_controller.h b/athena/main/athena_app_window_controller.h
index 78684d5623f50af6cefe5b4153e4ff33190f7b8f..ea2c17292d000f5c61a707ec115de97d62fa01d5 100644
--- a/athena/main/athena_app_window_controller.h
+++ b/athena/main/athena_app_window_controller.h
@@ -5,20 +5,20 @@
 #ifndef ATHENA_MAIN_ATHENA_APP_WINDOW_CONTROLLER_H_
 #define ATHENA_MAIN_ATHENA_APP_WINDOW_CONTROLLER_H_
 
-#include "apps/shell/browser/shell_app_window_controller.h"
 #include "base/macros.h"
+#include "extensions/shell/browser/shell_app_window_controller.h"
 
 namespace athena {
 
 // The shell app window controller for athena. It embeds the web_contents of
 // an app window into an Athena activity.
-class AthenaAppWindowController : public apps::ShellAppWindowController {
+class AthenaAppWindowController : public extensions::ShellAppWindowController {
  public:
   AthenaAppWindowController();
   virtual ~AthenaAppWindowController();
 
-  // Overridden from apps::ShellAppWindowController:
-  virtual apps::ShellAppWindow* CreateAppWindow(
+  // Overridden from extensions::ShellAppWindowController:
+  virtual extensions::ShellAppWindow* CreateAppWindow(
       content::BrowserContext* context) OVERRIDE;
   virtual void CloseAppWindows() OVERRIDE;