Move apps/shell to extensions/shell.

athena/main/athena_app_window_controller.cc

Index: athena/main/athena_app_window_controller.cc
diff --git a/athena/main/athena_app_window_controller.cc b/athena/main/athena_app_window_controller.cc
index df44bc5b58d2e2a3dff7108478d019a771e1bf58..a1da206b8fce334365f235b6f945b2ed9b40b195 100644
--- a/athena/main/athena_app_window_controller.cc
+++ b/athena/main/athena_app_window_controller.cc
@@ -4,11 +4,11 @@
 
 #include "athena/main/athena_app_window_controller.h"
 
-#include "apps/shell/browser/shell_app_window.h"
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "extensions/shell/browser/shell_app_window.h"
 
 namespace athena {
 
@@ -18,9 +18,9 @@ AthenaAppWindowController::AthenaAppWindowController() {
 AthenaAppWindowController::~AthenaAppWindowController() {
 }
 
-apps::ShellAppWindow* AthenaAppWindowController::CreateAppWindow(
+extensions::ShellAppWindow* AthenaAppWindowController::CreateAppWindow(
     content::BrowserContext* context) {
-  apps::ShellAppWindow* app_window = new apps::ShellAppWindow();
+  extensions::ShellAppWindow* app_window = new extensions::ShellAppWindow();
   app_window->Init(context, gfx::Size(100, 100));
   ActivityManager::Get()->AddActivity(ActivityFactory::Get()->CreateAppActivity(
       app_window));