Run athena on chrome

athena/extensions/chrome/athena_apps_client.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 CHROME_BROWSER_UI_APPS_CHROME_APPS_CLIENT_H_
-#define CHROME_BROWSER_UI_APPS_CHROME_APPS_CLIENT_H_
+#ifndef ATHENA_EXTENSIONS_CHROME_ATHENA_APPS_CLIENT_H_
+#define ATHENA_EXTENSIONS_CHROME_ATHENA_APPS_CLIENT_H_
 
 #include "apps/ui/apps_client.h"
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 
-template <typename T>
-struct DefaultSingletonTraits;
+namespace athena {
 
-// The implementation of AppsClient for Chrome.
-class ChromeAppsClient : public apps::AppsClient {
+// The implementation of AppsClient for Athena.
+class AthenaAppsClient : public apps::AppsClient {

[hashimoto, 2014/08/29 06:05:46]

To support apps.window API, Athena needs to implement its own AppsClient (and
NativeAppWindow and AppDelegate).
Can we reuse this class for the pure (non-Chrome) Athena?

If not, could you rename this class to something like ChromeAthenaAppsClient?

[oshima, 2014/08/29 14:40:32]

Yes, that's the plan. See my comment in CreateNativeAppWindow.

[hashimoto, 2014/09/01 05:33:30]

How are you going to remove chrome dependencies from GetLoadedBrowserContexts()
and IsCurrentChannelOlderThanDev()?
I guess it would make more sense to use separate implementations for pure Athena
and Athena on Chrome rather than sharing one implementation as the amount of
code shared between them would not be so large.

Anyways, I'm OK with this change as it would not be difficult to rename this
class even after this gets committed.

  public:
-  ChromeAppsClient();
-  virtual ~ChromeAppsClient();
-
-  // Get the LazyInstance for ChromeAppsClient.
-  static ChromeAppsClient* GetInstance();
+  AthenaAppsClient();
+  virtual ~AthenaAppsClient();
 
  private:
-  friend struct DefaultSingletonTraits<ChromeAppsClient>;
-
   // apps::AppsClient
   virtual std::vector<content::BrowserContext*> GetLoadedBrowserContexts()
       OVERRIDE;
   virtual apps::AppWindow* CreateAppWindow(
       content::BrowserContext* context,
       const extensions::Extension* extension) OVERRIDE;
   virtual extensions::NativeAppWindow* CreateNativeAppWindow(
       apps::AppWindow* window,
       const apps::AppWindow::CreateParams& params) OVERRIDE;
   virtual void IncrementKeepAliveCount() OVERRIDE;
   virtual void DecrementKeepAliveCount() OVERRIDE;
   virtual void OpenDevToolsWindow(content::WebContents* web_contents,
                                   const base::Closure& callback) OVERRIDE;
   virtual bool IsCurrentChannelOlderThanDev() OVERRIDE;
 
-  // Implemented in platform specific code.
-  static extensions::NativeAppWindow* CreateNativeAppWindowImpl(
-      apps::AppWindow* window,
-      const apps::AppWindow::CreateParams& params);
-
-  DISALLOW_COPY_AND_ASSIGN(ChromeAppsClient);
+  DISALLOW_COPY_AND_ASSIGN(AthenaAppsClient);
 };
 
-#endif  // CHROME_BROWSER_UI_APPS_CHROME_APPS_CLIENT_H_
+}  // namespace athena
+
+#endif  // ATHENA_EXTENSIONS_CHROME_ATHENA_APPS_CLIENT_H_