Support app.window.create on athena

athena/main/athena_main.cc

 // 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.
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/web_contents_view_delegate_creator.h"
 #include "athena/env/public/athena_env.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/main/athena_content_client.h"
 #include "athena/main/athena_renderer_pdf_helper.h"
 #include "athena/main/public/athena_launcher.h"
 #include "athena/screen/public/screen_manager.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #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"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/wm/core/visibility_controller.h"
 
 namespace {
 
@@ skipping 41 matching lines @@
   virtual void AddAppWindow(aura::Window* window) OVERRIDE {
     NOTIMPLEMENTED();
   }
 
   // Closes and destroys the app windows.
   virtual void CloseAppWindows() OVERRIDE {}
 
   DISALLOW_COPY_AND_ASSIGN(AthenaDesktopController);
 };
 
+class AthenaAppsClient : public extensions::AppsClient {
+ public:

[oshima, 2014/09/10 16:11:16]

// extensions::AppsClient:

[hashimoto, 2014/09/11 06:26:35]

Done.

+  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));
+    return new extensions::ShellNativeAppWindow(window, params);

[oshima, 2014/09/10 16:11:16]

FYI: CreateAppActivity currently creates its own widget. I'm changing this to
use the native app window instead.

[hashimoto, 2014/09/11 06:26:35]

Can't athena be satisfied with aura::Window* instead of views::Widget*?
NativeAppWindow exposes aura::Window*, but no views::Widget.

Though, it's not impossible to get views::Widget* from AppWindow if we replace
ShellNativeAppWindow with NativeAppWindowViews and cast the NativeAppWindow*
pointer returned by AppWindow::GetBaseWindow to NativeAppWindowViews*.

+  }
+
+  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;
+  }
+};

[oshima, 2014/09/10 16:11:16]

disallow_copy_and_assign

[hashimoto, 2014/09/11 06:26:35]

Done.

+
 class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
  public:
   AthenaBrowserMainDelegate() {}
   virtual ~AthenaBrowserMainDelegate() {}
 
   // extensions::ShellBrowserMainDelegate:
   virtual void Start(content::BrowserContext* context) OVERRIDE {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
     base::FilePath app_dir = base::FilePath::FromUTF8Unsafe(
@@ skipping 18 matching lines @@
 
   virtual void Shutdown() OVERRIDE {
     athena::AthenaEnv::Get()->OnTerminating();
     athena::ShutdownAthena();
   }
 
   virtual extensions::DesktopController* CreateDesktopController() OVERRIDE {
     return new AthenaDesktopController();
   }
 
+  virtual extensions::AppsClient* CreateAppsClient() OVERRIDE {
+    return new AthenaAppsClient();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
 };
 
 class AthenaContentBrowserClient
     : public extensions::ShellContentBrowserClient {
  public:
   AthenaContentBrowserClient()
       : extensions::ShellContentBrowserClient(new AthenaBrowserMainDelegate()) {
   }
@@ skipping 63 matching lines @@
 
 int main(int argc, const char** argv) {
   AthenaMainDelegate delegate;
   content::ContentMainParams params(&delegate);
 
   params.argc = argc;
   params.argv = argv;
 
   return content::ContentMain(params);
 }