6 files changed, 0 insertions, 105 deletions
diff --git a/athena/main/DEPS b/athena/main/DEPS
index 9942b76..4316d72 100644
--- a/athena/main/DEPS
+++ b/athena/main/DEPS
@@ -39,9 +39,6 @@ specific_include_rules = {
     "+extensions/shell/common",
     "+extensions/shell/renderer",
   ],
-  "athena_app_window_controller\.*": [
-    "+extensions/shell/browser",
-  ],
   "athena_content_client\.h": [
     "+extensions/shell/common",
   ],
diff --git a/athena/main/athena_app_window_controller.cc b/athena/main/athena_app_window_controller.cc
deleted file mode 100644
index 5e01798..0000000
--- a/athena/main/athena_app_window_controller.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "athena/main/athena_app_window_controller.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 {
-
-AthenaAppWindowController::AthenaAppWindowController() {
-}
-
-AthenaAppWindowController::~AthenaAppWindowController() {
-}
-
-extensions::ShellAppWindow* AthenaAppWindowController::CreateAppWindow(
-    content::BrowserContext* context,
-    const extensions::Extension* extension) {
-  extensions::ShellAppWindow* app_window = new extensions::ShellAppWindow();
-  app_window->Init(context, extension, gfx::Size(100, 100));
-  ActivityManager::Get()->AddActivity(ActivityFactory::Get()->CreateAppActivity(
-      app_window));
-  return app_window;
-}
-
-void AthenaAppWindowController::CloseAppWindows() {
-  // Do nothing.
-}
-
-}  // namespace athena
diff --git a/athena/main/athena_app_window_controller.h b/athena/main/athena_app_window_controller.h
deleted file mode 100644
index 24673a0..0000000
--- a/athena/main/athena_app_window_controller.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ATHENA_MAIN_ATHENA_APP_WINDOW_CONTROLLER_H_
-#define ATHENA_MAIN_ATHENA_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 extensions::ShellAppWindowController {
- public:
-  AthenaAppWindowController();
-  virtual ~AthenaAppWindowController();
-
-  // Overridden from extensions::ShellAppWindowController:
-  virtual extensions::ShellAppWindow* CreateAppWindow(
-      content::BrowserContext* context,
-      const extensions::Extension* extension) OVERRIDE;
-  virtual void CloseAppWindows() OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(AthenaAppWindowController);
-};
-
-}  // namespace athena
-
-#endif  // ATHENA_MAIN_ATHENA_APP_WINDOW_CONTROLLER_H_
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 247cd4a..f524156 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -60,7 +60,6 @@
         'browser/shell_app_delegate.h',
         'browser/shell_app_window.cc',
         'browser/shell_app_window.h',
-        'browser/shell_app_window_controller.h',
         'browser/shell_apps_client.cc',
         'browser/shell_apps_client.h',
         'browser/shell_audio_controller_chromeos.cc',
diff --git a/extensions/shell/browser/shell_app_window_controller.h b/extensions/shell/browser/shell_app_window_controller.h
deleted file mode 100644
index 65d9d8e..0000000
--- a/extensions/shell/browser/shell_app_window_controller.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_APP_WINDOW_CONTROLLER_H_
-#define EXTENSIONS_SHELL_BROWSER_SHELL_APP_WINDOW_CONTROLLER_H_
-
-namespace content {
-class BrowserContext;
-}
-
-namespace extensions {
-
-class Extension;
-class ShellAppWindow;
-
-class ShellAppWindowController {
- public:
-  virtual ~ShellAppWindowController() {}
-
-  // Creates a new app window and adds it to the desktop. This class should
-  // maintain the ownership of the window.
-  virtual ShellAppWindow* CreateAppWindow(content::BrowserContext* context,
-                                          const Extension* extension) = 0;
-
-  // Closes and destroys the app windows. Must be called before the extension
-  // is destroyed.
-  virtual void CloseAppWindows() = 0;
-};
-
-}  // namespace extensions
-
-#endif  // EXTENSIONS_SHELL_BROWSER_SHELL_APP_WINDOW_CONTROLLER_H_
diff --git a/extensions/shell/browser/shell_desktop_controller.h b/extensions/shell/browser/shell_desktop_controller.h
index b05da74..89de7a5 100644
--- a/extensions/shell/browser/shell_desktop_controller.h
+++ b/extensions/shell/browser/shell_desktop_controller.h
@@ -52,7 +52,6 @@ namespace extensions {
 
 class Extension;
 class ShellAppWindow;
-class ShellAppWindowController;
 
 // Handles desktop-related tasks for app_shell.
 class ShellDesktopController : public DesktopController,