Supprot V2 app: step1

athena/extensions/chrome/athena_app_delegate.h

 // 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_DELEGATE_H_
-#define EXTENSIONS_SHELL_BROWSER_SHELL_APP_DELEGATE_H_
+#ifndef ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_
+#define ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_
 
+#include "base/callback.h"

[Jun Mukai, 2014/09/10 00:07:11]

base/callback_forward.h would be more preferable.

[oshima, 2014/09/10 00:47:50]

This is necessary to have terminating_callback_ member variable.

+#include "base/memory/scoped_ptr.h"
 #include "extensions/browser/app_window/app_delegate.h"
+#include "ui/base/window_open_disposition.h"
 
-namespace extensions {
+namespace athena {
 
-// app_shell's AppDelegate implementation.
-class ShellAppDelegate : public AppDelegate {
+class AthenaAppDelegate : public extensions::AppDelegate {
  public:
-  ShellAppDelegate();
-  virtual ~ShellAppDelegate();
+  AthenaAppDelegate();
+  virtual ~AthenaAppDelegate();
 
-  // AppDelegate overrides:
+ 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;
   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 Extension* extension) OVERRIDE;
+      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;
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(ShellAppDelegate);
+  scoped_ptr<NewWindowContentsDelegate> new_window_contents_delegate_;
+  base::Closure terminating_callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(AthenaAppDelegate);
 };
 
-}  // namespace extensions
+}  // namespace athena
 
-#endif  // EXTENSIONS_SHELL_BROWSER_SHELL_APP_DELEGATE_H_
+#endif  // ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_