OLD | NEW |
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 23 matching lines...) Expand all Loading... |
34 bool IsAppPinned(const std::string& app_id) override; | 34 bool IsAppPinned(const std::string& app_id) override; |
35 void UnpinAppWithID(const std::string& app_id) override; | 35 void UnpinAppWithID(const std::string& app_id) override; |
36 | 36 |
37 // mash::wm::mojom::UserWindowObserver: | 37 // mash::wm::mojom::UserWindowObserver: |
38 void OnUserWindowObserverAdded( | 38 void OnUserWindowObserverAdded( |
39 mojo::Array<mash::wm::mojom::UserWindowPtr> user_windows) override; | 39 mojo::Array<mash::wm::mojom::UserWindowPtr> user_windows) override; |
40 void OnUserWindowAdded(mash::wm::mojom::UserWindowPtr user_window) override; | 40 void OnUserWindowAdded(mash::wm::mojom::UserWindowPtr user_window) override; |
41 void OnUserWindowRemoved(uint32_t window_id) override; | 41 void OnUserWindowRemoved(uint32_t window_id) override; |
42 void OnUserWindowTitleChanged(uint32_t window_id, | 42 void OnUserWindowTitleChanged(uint32_t window_id, |
43 const mojo::String& window_title) override; | 43 const mojo::String& window_title) override; |
| 44 void OnUserWindowAppIconChanged(uint32_t window_id, |
| 45 mojo::Array<uint8_t> app_icon) override; |
44 void OnUserWindowFocusChanged(uint32_t window_id, bool has_focus) override; | 46 void OnUserWindowFocusChanged(uint32_t window_id, bool has_focus) override; |
45 | 47 |
46 ShelfModel* model_; | 48 ShelfModel* model_; |
47 | 49 |
48 mash::wm::mojom::UserWindowControllerPtr user_window_controller_; | 50 mash::wm::mojom::UserWindowControllerPtr user_window_controller_; |
49 mojo::Binding<mash::wm::mojom::UserWindowObserver> binding_; | 51 mojo::Binding<mash::wm::mojom::UserWindowObserver> binding_; |
50 std::map<uint32_t, ShelfID> window_id_to_shelf_id_; | 52 std::map<uint32_t, ShelfID> window_id_to_shelf_id_; |
51 | 53 |
52 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus); | 54 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus); |
53 }; | 55 }; |
54 | 56 |
55 } // namespace sysui | 57 } // namespace sysui |
56 } // namespace ash | 58 } // namespace ash |
57 | 59 |
58 #endif // ASH_MUS_SHELF_DELEGATE_MUS_H_ | 60 #endif // ASH_MUS_SHELF_DELEGATE_MUS_H_ |
OLD | NEW |