V2 app support step3: Athena's NativeAppWindow

athena/extensions/athena_app_delegate_base.h

Index: athena/extensions/athena_app_delegate_base.h
diff --git a/athena/extensions/chrome/athena_app_delegate.h b/athena/extensions/athena_app_delegate_base.h
similarity index 49%
copy from athena/extensions/chrome/athena_app_delegate.h
copy to athena/extensions/athena_app_delegate_base.h
index 90d04966e95dad7b7f3deae21e27b0c8cbebf833..3d9843743ab45927046d5b75956630c6c293c1bc 100644
--- a/athena/extensions/chrome/athena_app_delegate.h
+++ b/athena/extensions/athena_app_delegate_base.h
@@ -2,26 +2,24 @@
 // 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_ATHENA_APP_DELEGATE_BASE_H_
+#define ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_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"
 
 namespace athena {
 
-class AthenaAppDelegate : public extensions::AppDelegate {
+class AthenaAppDelegateBase : public extensions::AppDelegate {
  public:
-  AthenaAppDelegate();
-  virtual ~AthenaAppDelegate();
+  AthenaAppDelegateBase();
+  virtual ~AthenaAppDelegateBase();
 
  private:
-  class NewWindowContentsDelegate;
+  class NewActivityContentsDelegate;
 
   // 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(
@@ -34,36 +32,18 @@ class AthenaAppDelegate : public extensions::AppDelegate {
                               const gfx::Rect& initial_pos,
                               bool user_gesture,
                               bool* was_blocked) OVERRIDE;
-  virtual content::ColorChooser* ShowColorChooser(
-      content::WebContents* web_contents,
-      SkColor initial_color) OVERRIDE;
-  virtual void RunFileChooser(
-      content::WebContents* tab,
-      const content::FileChooserParams& params) OVERRIDE;
-  virtual void RequestMediaAccessPermission(
-      content::WebContents* web_contents,
-      const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback,
-      const extensions::Extension* extension) OVERRIDE;
-  virtual bool CheckMediaAccessPermission(
-      content::WebContents* web_contents,
-      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_;
+  scoped_ptr<NewActivityContentsDelegate> new_window_contents_delegate_;
   base::Closure terminating_callback_;
 
-  DISALLOW_COPY_AND_ASSIGN(AthenaAppDelegate);
+  DISALLOW_COPY_AND_ASSIGN(AthenaAppDelegateBase);
 };
 
 }  // namespace athena
 
-#endif  // ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_
+#endif  // ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_