Remove app_shell chrome.shell API and ShellAppWindow

athena/content/shell/shell_app_activity.h

Index: athena/content/shell/shell_app_activity.h
diff --git a/athena/content/shell/shell_app_activity.h b/athena/content/shell/shell_app_activity.h
index ad3467bf602a972f8af828f0c28a4c59466032fa..a6b7dec87299257277acaac5d139e1b099c2ce52 100644
--- a/athena/content/shell/shell_app_activity.h
+++ b/athena/content/shell/shell_app_activity.h
@@ -11,7 +11,6 @@
 
 namespace extensions {
 class AppWindow;
-class ShellAppWindow;
 }
 
 namespace athena {
@@ -19,9 +18,6 @@ namespace athena {
 class ShellAppActivity : public AppActivity {
  public:
   explicit ShellAppActivity(extensions::AppWindow* app_window);
-  // TODO(hashimoto) Remove this.
-  ShellAppActivity(extensions::ShellAppWindow* app_window,
-                   const std::string& app_id);
   virtual ~ShellAppActivity();
 
  private:
@@ -32,7 +28,6 @@ class ShellAppActivity : public AppActivity {
   virtual views::WebView* GetWebView() OVERRIDE;
 
   extensions::AppWindow* app_window_;
-  scoped_ptr<extensions::ShellAppWindow> shell_app_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellAppActivity);
 };