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

Unified Diff: ash/app_list/app_list_presenter_delegate.h

Issue 2247503002: mash: Create and show a shelf in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix WindowManager WmShell::Shutdown; delay PointerWatcherEventRouter teardown; cleanup shutdown wor… Created 4 years, 4 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/app_list/app_list_presenter_delegate.h
diff --git a/ash/app_list/app_list_presenter_delegate.h b/ash/app_list/app_list_presenter_delegate.h
index 01d50889450ee24bdcf40c5e3204c60192e2b405..f837a14e34daed5173c39576d44fcf427e44acb7 100644
--- a/ash/app_list/app_list_presenter_delegate.h
+++ b/ash/app_list/app_list_presenter_delegate.h
@@ -8,7 +8,7 @@
#include <stdint.h>
#include "ash/ash_export.h"
-#include "ash/common/shelf/shelf_icon_observer.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "ash/common/shell_observer.h"
#include "base/macros.h"
#include "ui/app_list/presenter/app_list_presenter_delegate.h"
@@ -42,7 +42,7 @@ class ASH_EXPORT AppListPresenterDelegate
public ui::EventHandler,
public keyboard::KeyboardControllerObserver,
public ShellObserver,
- public ShelfIconObserver {
+ public WmShelfObserver {
public:
AppListPresenterDelegate(
app_list::AppListPresenter* presenter,
@@ -76,7 +76,7 @@ class ASH_EXPORT AppListPresenterDelegate
void OnMaximizeModeStarted() override;
void OnMaximizeModeEnded() override;
- // ShelfIconObserver overrides:
+ // WmShelfObserver overrides:
void OnShelfIconPositionsChanged() override;
// Whether the app list is visible (or in the process of being shown).
« no previous file with comments | « no previous file | ash/app_list/app_list_presenter_delegate.cc » ('j') | ui/views/mus/pointer_watcher_event_router.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698