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 #include "ash/common/shelf/shelf_controller.h" | 5 #include "ash/common/shelf/shelf_controller.h" |
6 | 6 |
7 #include "ash/common/shelf/shelf_item_delegate.h" | 7 #include "ash/common/shelf/shelf_item_delegate.h" |
8 #include "ash/common/shelf/shelf_menu_model.h" | 8 #include "ash/common/shelf/shelf_menu_model.h" |
9 #include "ash/common/shelf/wm_shelf.h" | 9 #include "ash/common/shelf/wm_shelf.h" |
10 #include "ash/common/wm_lookup.h" | 10 #include "ash/common/wm_lookup.h" |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 return new ShelfMenuModelMus(this); | 114 return new ShelfMenuModelMus(this); |
115 } | 115 } |
116 | 116 |
117 bool IsDraggable() override { | 117 bool IsDraggable() override { |
118 NOTIMPLEMENTED(); | 118 NOTIMPLEMENTED(); |
119 return false; | 119 return false; |
120 } | 120 } |
121 | 121 |
122 bool ShouldShowTooltip() override { return true; } | 122 bool ShouldShowTooltip() override { return true; } |
123 | 123 |
| 124 bool IsOpen() const override { return true; } |
| 125 |
124 void Close() override { NOTIMPLEMENTED(); } | 126 void Close() override { NOTIMPLEMENTED(); } |
125 | 127 |
126 mojom::ShelfItemDelegateAssociatedPtr delegate_; | 128 mojom::ShelfItemDelegateAssociatedPtr delegate_; |
127 bool pinned_ = false; | 129 bool pinned_ = false; |
128 std::map<uint32_t, base::string16> window_id_to_title_; | 130 std::map<uint32_t, base::string16> window_id_to_title_; |
129 base::string16 title_; | 131 base::string16 title_; |
130 | 132 |
131 DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus); | 133 DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus); |
132 }; | 134 }; |
133 | 135 |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 return; | 277 return; |
276 ShelfID shelf_id = app_id_to_shelf_id_[app_id]; | 278 ShelfID shelf_id = app_id_to_shelf_id_[app_id]; |
277 int index = model_.ItemIndexByID(shelf_id); | 279 int index = model_.ItemIndexByID(shelf_id); |
278 DCHECK_GE(index, 0); | 280 DCHECK_GE(index, 0); |
279 ShelfItem item = *model_.ItemByID(shelf_id); | 281 ShelfItem item = *model_.ItemByID(shelf_id); |
280 item.image = GetShelfIconFromBitmap(image); | 282 item.image = GetShelfIconFromBitmap(image); |
281 model_.Set(index, item); | 283 model_.Set(index, item); |
282 } | 284 } |
283 | 285 |
284 } // namespace ash | 286 } // namespace ash |
OLD | NEW |