| Index: chrome/browser/ui/ash/ash_init.h
|
| diff --git a/chrome/browser/ui/ash/ash_init.h b/chrome/browser/ui/ash/ash_init.h
|
| index 7faa8ff1997afbf076970b5a8c92b4f3bdc87391..9c9171e2a4e34057fbe15596808676e93e97919c 100644
|
| --- a/chrome/browser/ui/ash/ash_init.h
|
| +++ b/chrome/browser/ui/ash/ash_init.h
|
| @@ -5,17 +5,27 @@
|
| #ifndef CHROME_BROWSER_UI_ASH_ASH_INIT_H_
|
| #define CHROME_BROWSER_UI_ASH_ASH_INIT_H_
|
|
|
| -#include "ui/gfx/native_widget_types.h"
|
| +#include <memory>
|
|
|
| -namespace chrome {
|
| +#include "base/macros.h"
|
|
|
| -// Creates the Ash Shell and opens the Ash window. |remote_window| is only used
|
| -// on windows. It provides the HWND to the remote window.
|
| -void OpenAsh(gfx::AcceleratedWidget remote_window);
|
| +namespace ash {
|
| +namespace mus {
|
| +class WindowManager;
|
| +}
|
| +}
|
|
|
| -// Closes the Ash window and destroys the Ash Shell.
|
| -void CloseAsh();
|
| +// Creates and owns ash.
|
| +class AshInit {
|
| + public:
|
| + AshInit();
|
| + ~AshInit();
|
|
|
| -} // namespace chrome
|
| + private:
|
| + // Only created when running in ash::Config::MUS.
|
| + std::unique_ptr<ash::mus::WindowManager> window_manager_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(AshInit);
|
| +};
|
|
|
| #endif // CHROME_BROWSER_UI_ASH_ASH_INIT_H_
|
|
|