| Index: extensions/browser/app_window/apps_client.h
|
| diff --git a/apps/ui/apps_client.h b/extensions/browser/app_window/apps_client.h
|
| similarity index 71%
|
| rename from apps/ui/apps_client.h
|
| rename to extensions/browser/app_window/apps_client.h
|
| index f601e679a9f6dba2ff410a74f91640b68e71b7f2..7743b006394b3a48ac984b3d31e113733cc6036d 100644
|
| --- a/apps/ui/apps_client.h
|
| +++ b/extensions/browser/app_window/apps_client.h
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef APPS_UI_APPS_CLIENT_H_
|
| -#define APPS_UI_APPS_CLIENT_H_
|
| +#ifndef EXTENSIONS_BROWSER_APP_WINDOW_APPS_CLIENT_H_
|
| +#define EXTENSIONS_BROWSER_APP_WINDOW_APPS_CLIENT_H_
|
|
|
| #include <vector>
|
|
|
| -#include "apps/app_window.h"
|
| #include "base/callback_forward.h"
|
| +#include "extensions/browser/app_window/app_window.h"
|
|
|
| namespace content {
|
| class BrowserContext;
|
| @@ -16,27 +16,26 @@ class WebContents;
|
| }
|
|
|
| namespace extensions {
|
| +
|
| class Extension;
|
| class NativeAppWindow;
|
| -}
|
| -
|
| -namespace apps {
|
|
|
| // Sets up global state for the apps system. Should be Set() once in each
|
| // process. This should be implemented by the client of the apps system.
|
| +// TODO(hashimoto): Move some functions to ExtensionsClient and rename this to
|
| +// AppWindowClient.
|
| class AppsClient {
|
| public:
|
| // Get all loaded browser contexts.
|
| virtual std::vector<content::BrowserContext*> GetLoadedBrowserContexts() = 0;
|
|
|
| - // Creates a new apps::AppWindow for the app in |extension| for |context|.
|
| + // Creates a new AppWindow for the app in |extension| for |context|.
|
| // Caller takes ownership.
|
| - virtual AppWindow* CreateAppWindow(
|
| - content::BrowserContext* context,
|
| - const extensions::Extension* extension) = 0;
|
| + virtual AppWindow* CreateAppWindow(content::BrowserContext* context,
|
| + const Extension* extension) = 0;
|
|
|
| // Creates a new extensions::NativeAppWindow for |window|.
|
| - virtual extensions::NativeAppWindow* CreateNativeAppWindow(
|
| + virtual NativeAppWindow* CreateNativeAppWindow(
|
| AppWindow* window,
|
| const AppWindow::CreateParams& params) = 0;
|
|
|
| @@ -59,6 +58,6 @@ class AppsClient {
|
| static void Set(AppsClient* client);
|
| };
|
|
|
| -} // namespace apps
|
| +} // namespace extensions
|
|
|
| -#endif // APPS_UI_APPS_CLIENT_H_
|
| +#endif // EXTENSIONS_BROWSER_APP_WINDOW_APPS_CLIENT_H_
|
|
|