Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2120)

Unified Diff: ash/sysui/shell_delegate_mus.h

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/sysui/shell_delegate_mus.h
diff --git a/ash/sysui/shell_delegate_mus.h b/ash/sysui/shell_delegate_mus.h
index f6077a0f4a1f1f984067f37aa73cb81713428e0c..a9fdb52ce08548fe54e82f3464a348e227f659bc 100644
--- a/ash/sysui/shell_delegate_mus.h
+++ b/ash/sysui/shell_delegate_mus.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "ash/shell_delegate.h"
+#include "ash/common/shell_delegate.h"
#include "base/macros.h"
namespace keyboard {
@@ -20,7 +20,7 @@ class AppListPresenterMus;
namespace sysui {
-class ShellDelegateMus : public ash::ShellDelegate {
+class ShellDelegateMus : public ShellDelegate {
public:
explicit ShellDelegateMus(std::unique_ptr<AppListPresenterMus>);
~ShellDelegateMus() override;
@@ -43,12 +43,12 @@ class ShellDelegateMus : public ash::ShellDelegate {
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,

Powered by Google App Engine
This is Rietveld 408576698