| Index: athena/extensions/chrome/athena_apps_client.h
|
| diff --git a/chrome/browser/ui/apps/chrome_apps_client.h b/athena/extensions/chrome/athena_apps_client.h
|
| similarity index 54%
|
| copy from chrome/browser/ui/apps/chrome_apps_client.h
|
| copy to athena/extensions/chrome/athena_apps_client.h
|
| index cda63019aad82123195870e45903827d3e31f032..b78f831e92808ba57fafa09b73ebb17a1f397760 100644
|
| --- a/chrome/browser/ui/apps/chrome_apps_client.h
|
| +++ b/athena/extensions/chrome/athena_apps_client.h
|
| @@ -2,28 +2,21 @@
|
| // 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 "base/basictypes.h"
|
| -#include "base/compiler_specific.h"
|
| #include "extensions/browser/app_window/apps_client.h"
|
| +#include "base/macros.h"
|
|
|
| -template <typename T>
|
| -struct DefaultSingletonTraits;
|
| +namespace athena {
|
|
|
| -// The implementation of AppsClient for Chrome.
|
| -class ChromeAppsClient : public extensions::AppsClient {
|
| +// The implementation of AppsClient for Athena.
|
| +class AthenaAppsClient : public extensions::AppsClient {
|
| public:
|
| - ChromeAppsClient();
|
| - virtual ~ChromeAppsClient();
|
| -
|
| - // Get the LazyInstance for ChromeAppsClient.
|
| - static ChromeAppsClient* GetInstance();
|
| + AthenaAppsClient();
|
| + virtual ~AthenaAppsClient();
|
|
|
| private:
|
| - friend struct DefaultSingletonTraits<ChromeAppsClient>;
|
| -
|
| // extensions::AppsClient
|
| virtual std::vector<content::BrowserContext*> GetLoadedBrowserContexts()
|
| OVERRIDE;
|
| @@ -39,12 +32,9 @@ class ChromeAppsClient : public extensions::AppsClient {
|
| const base::Closure& callback) OVERRIDE;
|
| virtual bool IsCurrentChannelOlderThanDev() OVERRIDE;
|
|
|
| - // Implemented in platform specific code.
|
| - static extensions::NativeAppWindow* CreateNativeAppWindowImpl(
|
| - extensions::AppWindow* window,
|
| - const extensions::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_
|
|
|