Introduces AppActivity and handler of chrome.shell API.

athena/main/athena_app_window_controller.cc

Index: athena/main/athena_app_window_controller.cc
diff --git a/athena/main/athena_app_window_controller.cc b/athena/main/athena_app_window_controller.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3ec6199011a66a4734ee5b38a3f1bade6e1a098c
--- /dev/null
+++ b/athena/main/athena_app_window_controller.cc
@@ -0,0 +1,58 @@
+// 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/main/athena_app_window_controller.h"
+
+#include "apps/shell/browser/shell_app_window.h"
+#include "athena/activity/public/activity_factory.h"
+#include "athena/activity/public/activity_manager.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/public/browser/web_contents_observer.h"
+
+namespace athena {
+
+namespace {
+
+class AppWindowOwner : public content::WebContentsObserver {

[James Cook, 2014/06/16 16:12:30]

Could you document why the WebContents needs to own the app window? That seems a
little backwards -- I would expect the app to own the contents.  I guess this is
because the activity manager owns the WebContents?

[Jun Mukai, 2014/06/16 17:46:52]

Actually WebContents doesn't own the app window, the app window still owns
WebContents (and the WebContents is attached to an AppActivity), and the
AppActivity is owned by the activity manager but the AppActivity cannot own the
app window for the dependency reason (possibly).

That's why I've added an owner class, which owns app window and removes the app
window when the AppActivity is closed.

This is really weird, and possibly a bad design though...

[Jun Mukai, 2014/06/16 17:58:11]

Thinking about this, and possibly better to make AppActivity own AppWindow.
Changed the code.

+ public:
+  AppWindowOwner(apps::ShellAppWindow* app_window)
+      : content::WebContentsObserver(app_window->GetAssociatedWebContents()),
+        app_window_(app_window) {
+  }
+
+  // content::WebContentsObserver:
+  virtual void RenderFrameDeleted(
+      content::RenderFrameHost* render_frame_host) OVERRIDE {
+    delete this;
+  }
+
+ private:
+  scoped_ptr<apps::ShellAppWindow> app_window_;
+  DISALLOW_COPY_AND_ASSIGN(AppWindowOwner);

[James Cook, 2014/06/16 16:12:31]

nit: blank line above

[Jun Mukai, 2014/06/16 17:46:52]

Done.

+};
+
+}  // namespace
+
+AthenaAppWindowController::AthenaAppWindowController() {
+}
+
+AthenaAppWindowController::~AthenaAppWindowController() {
+}
+
+apps::ShellAppWindow* AthenaAppWindowController::CreateAppWindow(
+    content::BrowserContext* context) {
+  apps::ShellAppWindow* app_window = new apps::ShellAppWindow();
+  app_window->Init(context, gfx::Size(100, 100));
+  ActivityManager::Get()->AddActivity(ActivityFactory::Get()->CreateAppActivity(
+      app_window->GetAssociatedWebContents()));
+  new AppWindowOwner(app_window);
+
+  return app_window;
+}
+
+void AthenaAppWindowController::CloseAppWindows() {
+  // Do nothing.
+}
+
+}  // namespace athena