Support app.window.create on athena

*src/athena
Change ShellAppActivity to accept both AppWindow and ShellAppWindow.
Implement AppsClient to create NativeAppWindow and AppDelegate instances.

*src/extensions/shell
Add a new method DefaultShellBrowserMainDelegate::CreateAppsClient() to inject athena's AppsClient.

*src/extensions/browser
Add missing dtor to extensions::AppsClient to destroy an instance with a base class pointer in DefaultShellBrowserMainDelegate.

BUG=387288
TBR=benwells@chromium.org for the addition of the missing dtor of extensions::AppsClient.

Review URL: https://codereview.chromium.org/552133003

Cr-Commit-Position: refs/heads/master@{#294363}

athena/content/shell/DEPS

 include_rules = [
-   "+extensions/shell/browser/shell_app_window.h",
+  "+extensions/browser/app_window",
+  "+extensions/shell/browser/shell_app_window.h",
 ]

athena/content/shell/content_activity_factory.cc

@@ -17,7 +17,7 @@ Activity* ContentActivityFactory::CreateAppActivity(
 Activity* ContentActivityFactory::CreateAppActivity(
     extensions::AppWindow* app_window,
     views::WebView* web_view) {
-  return NULL;
+  return new ShellAppActivity(app_window);
 }
 
 }  // namespace athena

athena/content/shell/shell_app_activity.cc

@@ -5,17 +5,25 @@
 #include "athena/content/shell/shell_app_activity.h"
 
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/shell/browser/shell_app_window.h"
 #include "ui/views/controls/webview/webview.h"
 
 namespace athena {
 
+ShellAppActivity::ShellAppActivity(extensions::AppWindow* app_window)
+    : AppActivity(app_window->extension_id()), app_window_(app_window) {
+}
+
 ShellAppActivity::ShellAppActivity(extensions::ShellAppWindow* app_window,
                                    const std::string& app_id)
-    : AppActivity(app_id), shell_app_window_(app_window) {
+    : AppActivity(app_id), app_window_(NULL), shell_app_window_(app_window) {
 }
 
 ShellAppActivity::~ShellAppActivity() {
+  if (app_window_)
+    app_window_->GetBaseWindow()->Close();  // Deletes |app_window_|.
 }
 
 views::Widget* ShellAppActivity::CreateWidget() {
@@ -24,6 +32,7 @@ views::Widget* ShellAppActivity::CreateWidget() {
 
 views::WebView* ShellAppActivity::GetWebView() {
   content::WebContents* web_contents =
+      app_window_ ? app_window_->web_contents() :
       shell_app_window_->GetAssociatedWebContents();
   views::WebView* web_view =
       new views::WebView(web_contents->GetBrowserContext());

athena/content/shell/shell_app_activity.h

@@ -10,6 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 
 namespace extensions {
+class AppWindow;
 class ShellAppWindow;
 }
 
@@ -17,6 +18,8 @@ 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();
@@ -28,6 +31,7 @@ class ShellAppActivity : public AppActivity {
   // AppActivity:
   virtual views::WebView* GetWebView() OVERRIDE;
 
+  extensions::AppWindow* app_window_;
   scoped_ptr<extensions::ShellAppWindow> shell_app_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellAppActivity);

athena/main/DEPS

@@ -34,6 +34,7 @@ include_rules = [
 specific_include_rules = {
   "athena_main\.cc": [
     "+content/public/app",
+    "+extensions/browser/app_window",
     "+extensions/shell/app",
     "+extensions/shell/browser",
     "+extensions/shell/common",

athena/main/athena_main.cc

@@ -17,12 +17,16 @@
 #include "components/pdf/renderer/ppb_pdf_impl.h"
 #include "content/public/app/content_main.h"
 #include "content/public/browser/browser_thread.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/apps_client.h"
 #include "extensions/shell/app/shell_main_delegate.h"
 #include "extensions/shell/browser/desktop_controller.h"
+#include "extensions/shell/browser/shell_app_delegate.h"
 #include "extensions/shell/browser/shell_app_window.h"
 #include "extensions/shell/browser/shell_browser_main_delegate.h"
 #include "extensions/shell/browser/shell_content_browser_client.h"
 #include "extensions/shell/browser/shell_extension_system.h"
+#include "extensions/shell/browser/shell_native_app_window.h"
 #include "extensions/shell/common/shell_content_client.h"
 #include "extensions/shell/common/switches.h"
 #include "extensions/shell/renderer/shell_content_renderer_client.h"
@@ -84,6 +88,50 @@ class AthenaDesktopController : public extensions::DesktopController {
   DISALLOW_COPY_AND_ASSIGN(AthenaDesktopController);
 };
 
+class AthenaAppsClient : public extensions::AppsClient {
+ public:
+  AthenaAppsClient() {}
+  virtual ~AthenaAppsClient() {}
+
+  // extensions::AppsClient:
+  virtual std::vector<content::BrowserContext*>
+  GetLoadedBrowserContexts() OVERRIDE {
+    NOTIMPLEMENTED();
+    return std::vector<content::BrowserContext*>();
+  }
+
+  virtual extensions::AppWindow* CreateAppWindow(
+      content::BrowserContext* context,
+      const extensions::Extension* extension) OVERRIDE {
+    return new extensions::AppWindow(
+        context, new extensions::ShellAppDelegate, extension);
+  }
+
+  virtual extensions::NativeAppWindow* CreateNativeAppWindow(
+      extensions::AppWindow* window,
+      const extensions::AppWindow::CreateParams& params) OVERRIDE {
+    athena::ActivityManager::Get()->AddActivity(
+        athena::ActivityFactory::Get()->CreateAppActivity(window, NULL));
+    return new extensions::ShellNativeAppWindow(window, params);
+  }
+
+  virtual void IncrementKeepAliveCount() OVERRIDE {}
+
+  virtual void DecrementKeepAliveCount() OVERRIDE {}
+
+  virtual void OpenDevToolsWindow(content::WebContents* web_contents,
+                                  const base::Closure& callback) OVERRIDE {
+    NOTIMPLEMENTED();
+  }
+
+  virtual bool IsCurrentChannelOlderThanDev() OVERRIDE {
+    return false;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AthenaAppsClient);
+};
+
 class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
  public:
   AthenaBrowserMainDelegate() {}
@@ -122,6 +170,10 @@ class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
     return new AthenaDesktopController();
   }
 
+  virtual extensions::AppsClient* CreateAppsClient() OVERRIDE {
+    return new AthenaAppsClient();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
 };

extensions/browser/app_window/apps_client.h

@@ -26,6 +26,8 @@ class NativeAppWindow;
 // AppWindowClient.
 class AppsClient {
  public:
+  virtual ~AppsClient() {}
+
   // Get all loaded browser contexts.
   virtual std::vector<content::BrowserContext*> GetLoadedBrowserContexts() = 0;
 

extensions/shell/browser/default_shell_browser_main_delegate.cc

@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "extensions/shell/browser/shell_apps_client.h"
 #include "extensions/shell/browser/shell_desktop_controller.h"
 #include "extensions/shell/browser/shell_extension_system.h"
 #include "extensions/shell/common/switches.h"
@@ -45,4 +46,8 @@ DesktopController* DefaultShellBrowserMainDelegate::CreateDesktopController() {
   return new ShellDesktopController();
 }
 
+AppsClient* DefaultShellBrowserMainDelegate::CreateAppsClient() {
+  return new ShellAppsClient();
+}
+
 }  // namespace extensions

extensions/shell/browser/default_shell_browser_main_delegate.h

@@ -22,6 +22,7 @@ class DefaultShellBrowserMainDelegate : public ShellBrowserMainDelegate {
   virtual void Start(content::BrowserContext* context) OVERRIDE;
   virtual void Shutdown() OVERRIDE;
   virtual DesktopController* CreateDesktopController() OVERRIDE;
+  virtual AppsClient* CreateAppsClient() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultShellBrowserMainDelegate);

extensions/shell/browser/shell_browser_main_delegate.h

@@ -11,6 +11,7 @@ class BrowserContext;
 
 namespace extensions {
 
+class AppsClient;
 class DesktopController;
 
 class ShellBrowserMainDelegate {
@@ -29,6 +30,9 @@ class ShellBrowserMainDelegate {
   // and window manager. Subclass may return its subclass to customize the
   // windo manager.
   virtual DesktopController* CreateDesktopController() = 0;
+
+  // Creates the AppsClient instance to support app.window extension API.
+  virtual AppsClient* CreateAppsClient() = 0;
 };
 
 }  // namespace extensions

extensions/shell/browser/shell_browser_main_parts.cc

@@ -12,9 +12,9 @@
 #include "content/public/common/result_codes.h"
 #include "content/shell/browser/shell_devtools_delegate.h"
 #include "content/shell/browser/shell_net_log.h"
+#include "extensions/browser/app_window/apps_client.h"
 #include "extensions/browser/browser_context_keyed_service_factories.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/shell/browser/shell_apps_client.h"
 #include "extensions/shell/browser/shell_browser_context.h"
 #include "extensions/shell/browser/shell_browser_main_delegate.h"
 #include "extensions/shell/browser/shell_desktop_controller.h"
@@ -118,7 +118,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
 
   device_client_.reset(new ShellDeviceClient);
 
-  apps_client_.reset(new ShellAppsClient());
+  apps_client_.reset(browser_main_delegate_->CreateAppsClient());
   extensions::AppsClient::Set(apps_client_.get());
 
   extensions_client_.reset(new ShellExtensionsClient());

extensions/shell/browser/shell_browser_main_parts.h

@@ -27,8 +27,8 @@ class NetLog;
 
 namespace extensions {
 
+class AppsClient;
 class DesktopController;
-class ShellAppsClient;
 class ShellBrowserContext;
 class ShellBrowserMainDelegate;
 class ShellDeviceClient;
@@ -74,7 +74,7 @@ class ShellBrowserMainParts : public content::BrowserMainParts {
   scoped_ptr<DesktopController> desktop_controller_;
   scoped_ptr<ShellBrowserContext> browser_context_;
   scoped_ptr<ShellDeviceClient> device_client_;
-  scoped_ptr<ShellAppsClient> apps_client_;
+  scoped_ptr<AppsClient> apps_client_;
   scoped_ptr<ShellExtensionsClient> extensions_client_;
   scoped_ptr<ShellExtensionsBrowserClient> extensions_browser_client_;
   scoped_ptr<net::NetLog> net_log_;