mash: Migrate ShellDelegate ownership and access to WmShell.
Move ownership of ShellDelegate to WMShell (was in Shell).
(pass via WmShell[Aura|Mus] constructors, create earlier)
TODO: Port and use ShellDelegateMus in ash::mus::WindowManager::Init?
TODO: Move VirtualKeyboardStateObserver out of shell_delegate.h
BUG=619636
TEST=Compiles; unit tests; no behavior changes.
[email protected]
[email protected],[email protected]
Review-Url: https://codereview.chromium.org/2118593002
Cr-Commit-Position: refs/heads/master@{#403964}
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index 17999741..ce80c0c0 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -8,7 +8,7 @@
#include <memory>
#include <string>
-#include "ash/shell_delegate.h"
+#include "ash/common/shell_delegate.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
@@ -26,7 +26,7 @@
class ShelfDelegateImpl;
-class ShellDelegateImpl : public ash::ShellDelegate {
+class ShellDelegateImpl : public ShellDelegate {
public:
ShellDelegateImpl();
~ShellDelegateImpl() override;
@@ -49,12 +49,12 @@
void OpenUrl(const GURL& url) override;
app_list::AppListPresenter* GetAppListPresenter() override;
ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
- ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
- ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
- ash::SessionStateDelegate* CreateSessionStateDelegate() override;
- ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
- ash::NewWindowDelegate* CreateNewWindowDelegate() override;
- ash::MediaDelegate* CreateMediaDelegate() override;
+ SystemTrayDelegate* CreateSystemTrayDelegate() override;
+ UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
+ SessionStateDelegate* CreateSessionStateDelegate() override;
+ AccessibilityDelegate* CreateAccessibilityDelegate() override;
+ NewWindowDelegate* CreateNewWindowDelegate() override;
+ MediaDelegate* CreateMediaDelegate() override;
std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate()
override;
ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,
