| 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/mus/shelf_delegate_mus.h" | 5 #include "ash/mus/shelf_delegate_mus.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "ash/shelf/shelf.h" | 9 #include "ash/shelf/shelf.h" |
| 10 #include "ash/shelf/shelf_item_delegate.h" | 10 #include "ash/shelf/shelf_item_delegate.h" |
| 11 #include "ash/shelf/shelf_item_delegate_manager.h" | 11 #include "ash/shelf/shelf_item_delegate_manager.h" |
| 12 #include "ash/shelf/shelf_layout_manager.h" | 12 #include "ash/shelf/shelf_layout_manager.h" |
| 13 #include "ash/shelf/shelf_model.h" | 13 #include "ash/shelf/shelf_model.h" |
| 14 #include "ash/shelf/shelf_types.h" | 14 #include "ash/shelf/shelf_types.h" |
| 15 #include "ash/shelf/shelf_widget.h" | 15 #include "ash/shelf/shelf_widget.h" |
| 16 #include "ash/shell.h" | 16 #include "ash/shell.h" |
| 17 #include "base/strings/string_util.h" | 17 #include "base/strings/string_util.h" |
| 18 #include "components/mus/public/cpp/property_type_converters.h" | 18 #include "components/mus/public/cpp/property_type_converters.h" |
| 19 #include "components/mus/public/cpp/window.h" | 19 #include "components/mus/public/cpp/window.h" |
| 20 #include "components/mus/public/cpp/window_property.h" | 20 #include "components/mus/public/cpp/window_property.h" |
| 21 #include "mojo/common/common_type_converters.h" | 21 #include "mojo/common/common_type_converters.h" |
| 22 #include "mojo/shell/public/cpp/connector.h" | 22 #include "services/shell/public/cpp/connector.h" |
| 23 #include "skia/public/type_converters.h" | 23 #include "skia/public/type_converters.h" |
| 24 #include "ui/aura/mus/mus_util.h" | 24 #include "ui/aura/mus/mus_util.h" |
| 25 #include "ui/base/resource/resource_bundle.h" | 25 #include "ui/base/resource/resource_bundle.h" |
| 26 #include "ui/gfx/image/image_skia.h" | 26 #include "ui/gfx/image/image_skia.h" |
| 27 #include "ui/resources/grit/ui_resources.h" | 27 #include "ui/resources/grit/ui_resources.h" |
| 28 #include "ui/views/mus/window_manager_connection.h" | 28 #include "ui/views/mus/window_manager_connection.h" |
| 29 | 29 |
| 30 using mash::wm::mojom::UserWindowController; | 30 using mash::wm::mojom::UserWindowController; |
| 31 | 31 |
| 32 namespace ash { | 32 namespace ash { |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 DCHECK_GE(index, 0); | 316 DCHECK_GE(index, 0); |
| 317 ShelfItems::const_iterator iter = model_->ItemByID(shelf_id); | 317 ShelfItems::const_iterator iter = model_->ItemByID(shelf_id); |
| 318 DCHECK(iter != model_->items().end()); | 318 DCHECK(iter != model_->items().end()); |
| 319 ShelfItem item = *iter; | 319 ShelfItem item = *iter; |
| 320 item.status = has_focus ? STATUS_ACTIVE : STATUS_RUNNING; | 320 item.status = has_focus ? STATUS_ACTIVE : STATUS_RUNNING; |
| 321 model_->Set(index, item); | 321 model_->Set(index, item); |
| 322 } | 322 } |
| 323 | 323 |
| 324 } // namespace sysui | 324 } // namespace sysui |
| 325 } // namespace ash | 325 } // namespace ash |
| OLD | NEW |