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

Side by Side Diff: ash/mus/shelf_delegate_mus.h

Issue 1899323002: Add mash shelf application id support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/mus/shelf_delegate_mus.cc » ('j') | ash/mus/shelf_delegate_mus.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_MUS_SHELF_DELEGATE_MUS_H_ 5 #ifndef ASH_MUS_SHELF_DELEGATE_MUS_H_
6 #define ASH_MUS_SHELF_DELEGATE_MUS_H_ 6 #define ASH_MUS_SHELF_DELEGATE_MUS_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/shelf/shelf_delegate.h" 10 #include "ash/shelf/shelf_delegate.h"
(...skipping 28 matching lines...) Expand all
39 void PinAppWithID(const std::string& app_id) override; 39 void PinAppWithID(const std::string& app_id) override;
40 bool IsAppPinned(const std::string& app_id) override; 40 bool IsAppPinned(const std::string& app_id) override;
41 void UnpinAppWithID(const std::string& app_id) override; 41 void UnpinAppWithID(const std::string& app_id) override;
42 42
43 // mash::shelf::mojom::ShelfController: 43 // mash::shelf::mojom::ShelfController:
44 void AddObserver( 44 void AddObserver(
45 mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) override; 45 mash::shelf::mojom::ShelfObserverAssociatedPtrInfo observer) override;
46 void SetAlignment(mash::shelf::mojom::Alignment alignment) override; 46 void SetAlignment(mash::shelf::mojom::Alignment alignment) override;
47 void SetAutoHideBehavior( 47 void SetAutoHideBehavior(
48 mash::shelf::mojom::AutoHideBehavior auto_hide) override; 48 mash::shelf::mojom::AutoHideBehavior auto_hide) override;
49 void AddItem( 49 void PinItem(
50 mash::shelf::mojom::ShelfItemPtr item, 50 mash::shelf::mojom::ShelfItemPtr item,
51 mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override; 51 mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override;
52 void RemoveItem(const mojo::String& id) override; 52 void UnpinItem(const mojo::String& app_id) override;
53 53
54 // mash::wm::mojom::UserWindowObserver: 54 // mash::wm::mojom::UserWindowObserver:
55 void OnUserWindowObserverAdded( 55 void OnUserWindowObserverAdded(
56 mojo::Array<mash::wm::mojom::UserWindowPtr> user_windows) override; 56 mojo::Array<mash::wm::mojom::UserWindowPtr> user_windows) override;
57 void OnUserWindowAdded(mash::wm::mojom::UserWindowPtr user_window) override; 57 void OnUserWindowAdded(mash::wm::mojom::UserWindowPtr user_window) override;
58 void OnUserWindowRemoved(uint32_t window_id) override; 58 void OnUserWindowRemoved(uint32_t window_id) override;
59 void OnUserWindowTitleChanged(uint32_t window_id, 59 void OnUserWindowTitleChanged(uint32_t window_id,
60 const mojo::String& window_title) override; 60 const mojo::String& window_title) override;
61 void OnUserWindowAppIconChanged(uint32_t window_id, 61 void OnUserWindowAppIconChanged(uint32_t window_id,
62 mojo::Array<uint8_t> app_icon) override; 62 mojo::Array<uint8_t> app_icon) override;
(...skipping 13 matching lines...) Expand all
76 76
77 std::map<std::string, ShelfID> app_id_to_shelf_id_; 77 std::map<std::string, ShelfID> app_id_to_shelf_id_;
78 78
79 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus); 79 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus);
80 }; 80 };
81 81
82 } // namespace sysui 82 } // namespace sysui
83 } // namespace ash 83 } // namespace ash
84 84
85 #endif // ASH_MUS_SHELF_DELEGATE_MUS_H_ 85 #endif // ASH_MUS_SHELF_DELEGATE_MUS_H_
OLDNEW
« no previous file with comments | « no previous file | ash/mus/shelf_delegate_mus.cc » ('j') | ash/mus/shelf_delegate_mus.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698