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

Unified Diff: ash/mus/shelf_delegate_mus.h

Issue 2007003002: mash: Preliminary support for shelf auto-hide (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shutdown
Patch Set: cleanup Created 4 years, 7 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
« no previous file with comments | « no previous file | ash/mus/shelf_delegate_mus.cc » ('j') | ash/shelf/shelf_button.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/shelf_delegate_mus.h
diff --git a/ash/mus/shelf_delegate_mus.h b/ash/mus/shelf_delegate_mus.h
index 5baba1b38147dc32f5b83054ad86d998a1f9a17a..e6e59f761fc650dc1fa16922a2124a50b9620ae6 100644
--- a/ash/mus/shelf_delegate_mus.h
+++ b/ash/mus/shelf_delegate_mus.h
@@ -8,6 +8,7 @@
#include <map>
#include "ash/shelf/shelf_delegate.h"
+#include "ash/shelf/shelf_layout_manager_observer.h"
#include "mash/shelf/public/interfaces/shelf.mojom.h"
#include "mash/wm/public/interfaces/shelf_layout.mojom.h"
#include "mash/wm/public/interfaces/user_window_controller.mojom.h"
@@ -20,7 +21,10 @@ class ShelfModel;
namespace sysui {
+// Manages communication between the ash_sysui shelf, the window manager, and
+// the browser.
class ShelfDelegateMus : public ShelfDelegate,
+ public ShelfLayoutManagerObserver,
public mash::shelf::mojom::ShelfController,
public mash::wm::mojom::UserWindowObserver {
public:
@@ -40,6 +44,12 @@ class ShelfDelegateMus : public ShelfDelegate,
bool IsAppPinned(const std::string& app_id) override;
void UnpinAppWithID(const std::string& app_id) override;
+ // ShelfLayoutManagerObserver:
msw 2016/05/24 20:46:55 I wonder if this should be done through ShelfDeleg
James Cook 2016/05/25 00:25:43 Done.
+ void DidChangeVisibilityState(ShelfLayoutManager* layout_manager,
+ ShelfVisibilityState new_state) override;
+ void OnAutoHideStateChanged(ShelfLayoutManager* layout_manager,
+ ShelfAutoHideState new_state) override;
+
// mash::shelf::mojom::ShelfController:
void AddObserver(
mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) override;
« no previous file with comments | « no previous file | ash/mus/shelf_delegate_mus.cc » ('j') | ash/shelf/shelf_button.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698