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

Unified Diff: ash/sysui/shelf_delegate_mus.h

Issue 2259153002: mash: Port ash_sysui ShelfDelegateMus impl to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. 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
« no previous file with comments | « ash/sysui/BUILD.gn ('k') | ash/sysui/shelf_delegate_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sysui/shelf_delegate_mus.h
diff --git a/ash/sysui/shelf_delegate_mus.h b/ash/sysui/shelf_delegate_mus.h
deleted file mode 100644
index 74b3948432b043422517394b3524f8c6a7733050..0000000000000000000000000000000000000000
--- a/ash/sysui/shelf_delegate_mus.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ASH_SYSUI_SHELF_DELEGATE_MUS_H_
-#define ASH_SYSUI_SHELF_DELEGATE_MUS_H_
-
-#include <map>
-
-#include "ash/common/shelf/shelf_delegate.h"
-#include "mash/shelf/public/interfaces/shelf.mojom.h"
-#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/cpp/bindings/interface_ptr_set.h"
-
-namespace ash {
-
-class ShelfModel;
-
-namespace sysui {
-
-// Manages communication between the mash shelf and the browser.
-// TODO(mash): Support ShelfController in mojo:ash and remove this sysui impl.
-class ShelfDelegateMus : public ShelfDelegate,
- public mash::shelf::mojom::ShelfController {
- public:
- explicit ShelfDelegateMus(ShelfModel* model);
- ~ShelfDelegateMus() override;
-
- private:
- // ShelfDelegate:
- void OnShelfCreated(Shelf* shelf) override;
- void OnShelfDestroyed(Shelf* shelf) override;
- void OnShelfAlignmentChanged(Shelf* shelf) override;
- void OnShelfAutoHideBehaviorChanged(Shelf* shelf) override;
- void OnShelfAutoHideStateChanged(Shelf* shelf) override;
- void OnShelfVisibilityStateChanged(Shelf* shelf) override;
- ShelfID GetShelfIDForAppID(const std::string& app_id) override;
- bool HasShelfIDToAppIDMapping(ShelfID id) const override;
- const std::string& GetAppIDForShelfID(ShelfID id) override;
- void PinAppWithID(const std::string& app_id) override;
- bool IsAppPinned(const std::string& app_id) override;
- void UnpinAppWithID(const std::string& app_id) override;
-
- // mash::shelf::mojom::ShelfController:
- void AddObserver(
- mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) override;
- void SetAlignment(mash::shelf::mojom::Alignment alignment) override;
- void SetAutoHideBehavior(
- mash::shelf::mojom::AutoHideBehavior auto_hide) override;
- void PinItem(
- mash::shelf::mojom::ShelfItemPtr item,
- mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override;
- void UnpinItem(const mojo::String& app_id) override;
- void SetItemImage(const mojo::String& app_id, const SkBitmap& image) override;
-
- // Set the Mus window preferred sizes.
- void SetShelfPreferredSizes(Shelf* shelf);
-
- ShelfModel* model_;
-
- mojo::AssociatedInterfacePtrSet<mash::shelf::mojom::ShelfObserver> observers_;
-
- std::map<uint32_t, ShelfID> window_id_to_shelf_id_;
-
- std::map<std::string, ShelfID> app_id_to_shelf_id_;
- std::map<ShelfID, std::string> shelf_id_to_app_id_;
-
- DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus);
-};
-
-} // namespace sysui
-} // namespace ash
-
-#endif // ASH_SYSUI_SHELF_DELEGATE_MUS_H_
« no previous file with comments | « ash/sysui/BUILD.gn ('k') | ash/sysui/shelf_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698