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

Unified Diff: ash/shell/shell_delegate_impl.h

Issue 2576913002: Use mojo app list interfaces for mash and classic ash. (Closed)
Patch Set: Add missing dep. Created 4 years 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/shell/shell_delegate_impl.h
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index 7d8ae4138ce21bdc4992d6009cddd459a929b667..4836b3a4cc83fd2f16462074b71f8bb67140e24e 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -11,11 +11,6 @@
#include "ash/common/shell_delegate.h"
#include "base/macros.h"
-namespace app_list {
-class AppListPresenterDelegateFactory;
-class AppListPresenterImpl;
-}
-
namespace keyboard {
class KeyboardUI;
}
@@ -40,7 +35,6 @@ class ShellDelegateImpl : public ShellDelegate {
void Exit() override;
keyboard::KeyboardUI* CreateKeyboardUI() override;
void OpenUrlFromArc(const GURL& url) override;
- app_list::AppListPresenter* GetAppListPresenter() override;
ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
SystemTrayDelegate* CreateSystemTrayDelegate() override;
std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
@@ -58,10 +52,7 @@ class ShellDelegateImpl : public ShellDelegate {
void UpdateTouchscreenStatusFromPrefs() override;
private:
- ShelfDelegate* shelf_delegate_;
- std::unique_ptr<app_list::AppListPresenterDelegateFactory>
- app_list_presenter_delegate_factory_;
- std::unique_ptr<app_list::AppListPresenterImpl> app_list_presenter_;
+ ShelfDelegate* shelf_delegate_ = nullptr;
DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
};

Powered by Google App Engine
This is Rietveld 408576698