| Index: chrome/browser/ui/apps/chrome_apps_client.h
|
| diff --git a/chrome/browser/apps/chrome_apps_client.h b/chrome/browser/ui/apps/chrome_apps_client.h
|
| similarity index 62%
|
| rename from chrome/browser/apps/chrome_apps_client.h
|
| rename to chrome/browser/ui/apps/chrome_apps_client.h
|
| index 7e318e853cb9831ff8d7489779001356faacba57..b8d3db0ce88df1b3d449b490cdb1d620b59365cd 100644
|
| --- a/chrome/browser/apps/chrome_apps_client.h
|
| +++ b/chrome/browser/ui/apps/chrome_apps_client.h
|
| @@ -2,14 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_APPS_CHROME_APPS_CLIENT_H_
|
| -#define CHROME_BROWSER_APPS_CHROME_APPS_CLIENT_H_
|
| +#ifndef CHROME_BROWSER_UI_APPS_CHROME_APPS_CLIENT_H_
|
| +#define CHROME_BROWSER_UI_APPS_CHROME_APPS_CLIENT_H_
|
|
|
| -#include "apps/apps_client.h"
|
| +#include "apps/ui/apps_client.h"
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
|
|
| -template<typename T> struct DefaultSingletonTraits;
|
| +template <typename T>
|
| +struct DefaultSingletonTraits;
|
|
|
| // The implementation of AppsClient for Chrome.
|
| class ChromeAppsClient : public apps::AppsClient {
|
| @@ -29,10 +30,18 @@ class ChromeAppsClient : public apps::AppsClient {
|
| virtual apps::AppWindow* CreateAppWindow(
|
| content::BrowserContext* context,
|
| const extensions::Extension* extension) OVERRIDE;
|
| + virtual apps::NativeAppWindow* CreateNativeAppWindow(
|
| + apps::AppWindow* window,
|
| + const apps::AppWindow::CreateParams& params) OVERRIDE;
|
| virtual void IncrementKeepAliveCount() OVERRIDE;
|
| virtual void DecrementKeepAliveCount() OVERRIDE;
|
|
|
| + // Implemented in platform specific code.
|
| + static apps::NativeAppWindow* CreateNativeAppWindowImpl(
|
| + apps::AppWindow* window,
|
| + const apps::AppWindow::CreateParams& params);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ChromeAppsClient);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_APPS_CHROME_APPS_CLIENT_H_
|
| +#endif // CHROME_BROWSER_UI_APPS_CHROME_APPS_CLIENT_H_
|
|
|