V2 app support step3: Athena's NativeAppWindow

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"
@@ skipping 57 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:
-  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() {}
   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 20 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);
 }