V2 app support step3: Athena's NativeAppWindow

athena/extensions/shell/athena_shell_app_delegate.h

Index: athena/extensions/shell/athena_shell_app_delegate.h
diff --git a/athena/extensions/chrome/athena_app_delegate.h b/athena/extensions/shell/athena_shell_app_delegate.h
similarity index 42%
rename from athena/extensions/chrome/athena_app_delegate.h
rename to athena/extensions/shell/athena_shell_app_delegate.h
index 90d04966e95dad7b7f3deae21e27b0c8cbebf833..7cfe919aa2d584e259315e22ed28ba42c9eaca25 100644
--- a/athena/extensions/chrome/athena_app_delegate.h
+++ b/athena/extensions/shell/athena_shell_app_delegate.h
@@ -2,38 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_
-#define ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_
+#ifndef ATHENA_EXTENSIONS_SHELL_ATHENA_APP_DELEGATE_H_
+#define ATHENA_EXTENSIONS_SHELL_ATHENA_APP_DELEGATE_H_
 
-#include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
-#include "extensions/browser/app_window/app_delegate.h"
-#include "ui/base/window_open_disposition.h"
+#include "athena/extensions/athena_app_delegate_base.h"
 
 namespace athena {
 
-class AthenaAppDelegate : public extensions::AppDelegate {
+class AthenaShellAppDelegate : public AthenaAppDelegateBase {
  public:
-  AthenaAppDelegate();
-  virtual ~AthenaAppDelegate();
+  AthenaShellAppDelegate();
+  virtual ~AthenaShellAppDelegate();
 
  private:
-  class NewWindowContentsDelegate;
-
   // extensions::AppDelegate:
   virtual void InitWebContents(content::WebContents* web_contents) OVERRIDE;
-  virtual void ResizeWebContents(content::WebContents* web_contents,
-                                 const gfx::Size& size) OVERRIDE;
-  virtual content::WebContents* OpenURLFromTab(
-      content::BrowserContext* context,
-      content::WebContents* source,
-      const content::OpenURLParams& params) OVERRIDE;
-  virtual void AddNewContents(content::BrowserContext* context,
-                              content::WebContents* new_contents,
-                              WindowOpenDisposition disposition,
-                              const gfx::Rect& initial_pos,
-                              bool user_gesture,
-                              bool* was_blocked) OVERRIDE;
   virtual content::ColorChooser* ShowColorChooser(
       content::WebContents* web_contents,
       SkColor initial_color) OVERRIDE;
@@ -50,20 +33,12 @@ class AthenaAppDelegate : public extensions::AppDelegate {
       const GURL& security_origin,
       content::MediaStreamType type,
       const extensions::Extension* extension) OVERRIDE;
-  virtual int PreferredIconSize() OVERRIDE;
-  virtual gfx::ImageSkia GetAppDefaultIcon() OVERRIDE;
   virtual void SetWebContentsBlocked(content::WebContents* web_contents,
                                      bool blocked) OVERRIDE;
-  virtual bool IsWebContentsVisible(
-      content::WebContents* web_contents) OVERRIDE;
-  virtual void SetTerminatingCallback(const base::Closure& callback) OVERRIDE;
-
-  scoped_ptr<NewWindowContentsDelegate> new_window_contents_delegate_;
-  base::Closure terminating_callback_;
 
-  DISALLOW_COPY_AND_ASSIGN(AthenaAppDelegate);
+  DISALLOW_COPY_AND_ASSIGN(AthenaShellAppDelegate);
 };
 
 }  // namespace athena
 
-#endif  // ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_
+#endif  // ATHENA_EXTENSIONS_SHELL_ATHENA_APP_DELEGATE_H_