| Index: athena/extensions/chrome/athena_chrome_apps_client.h
|
| diff --git a/athena/extensions/chrome/athena_apps_client.h b/athena/extensions/chrome/athena_chrome_apps_client.h
|
| similarity index 54%
|
| copy from athena/extensions/chrome/athena_apps_client.h
|
| copy to athena/extensions/chrome/athena_chrome_apps_client.h
|
| index b78f831e92808ba57fafa09b73ebb17a1f397760..d064d35bd5c750bf0a5ffce9ea477fe1417f8f1e 100644
|
| --- a/athena/extensions/chrome/athena_apps_client.h
|
| +++ b/athena/extensions/chrome/athena_chrome_apps_client.h
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ATHENA_EXTENSIONS_CHROME_ATHENA_APPS_CLIENT_H_
|
| -#define ATHENA_EXTENSIONS_CHROME_ATHENA_APPS_CLIENT_H_
|
| +#ifndef ATHENA_EXTENSIONS_CHROME_ATHENA_CHROME_APPS_CLIENT_H_
|
| +#define ATHENA_EXTENSIONS_CHROME_ATHENA_CHROME_APPS_CLIENT_H_
|
|
|
| -#include "extensions/browser/app_window/apps_client.h"
|
| +#include "athena/extensions/athena_apps_client_base.h"
|
| #include "base/macros.h"
|
|
|
| namespace athena {
|
|
|
| // The implementation of AppsClient for Athena.
|
| -class AthenaAppsClient : public extensions::AppsClient {
|
| +class AthenaChromeAppsClient : public AthenaAppsClientBase {
|
| public:
|
| - AthenaAppsClient();
|
| - virtual ~AthenaAppsClient();
|
| + AthenaChromeAppsClient();
|
| + virtual ~AthenaChromeAppsClient();
|
|
|
| private:
|
| // extensions::AppsClient
|
| @@ -23,18 +23,13 @@ class AthenaAppsClient : public extensions::AppsClient {
|
| virtual extensions::AppWindow* CreateAppWindow(
|
| content::BrowserContext* context,
|
| const extensions::Extension* extension) OVERRIDE;
|
| - virtual extensions::NativeAppWindow* CreateNativeAppWindow(
|
| - extensions::AppWindow* window,
|
| - const extensions::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;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(AthenaAppsClient);
|
| + DISALLOW_COPY_AND_ASSIGN(AthenaChromeAppsClient);
|
| };
|
|
|
| } // namespace athena
|
|
|
| -#endif // ATHENA_EXTENSIONS_CHROME_ATHENA_APPS_CLIENT_H_
|
| +#endif // ATHENA_EXTENSIONS_CHROME_ATHENA_CHROME_APPS_CLIENT_H_
|
|
|