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/sysui/shelf_delegate_mus.h" | 5 #include "ash/sysui/shelf_delegate_mus.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "ash/common/shelf/shelf_item_delegate.h" | 9 #include "ash/common/shelf/shelf_item_delegate.h" |
10 #include "ash/common/shelf/shelf_item_delegate_manager.h" | 10 #include "ash/common/shelf/shelf_item_delegate_manager.h" |
| 11 #include "ash/common/shelf/shelf_menu_model.h" |
11 #include "ash/common/shelf/shelf_model.h" | 12 #include "ash/common/shelf/shelf_model.h" |
12 #include "ash/common/shelf/shelf_types.h" | 13 #include "ash/common/shelf/shelf_types.h" |
13 #include "ash/shelf/shelf.h" | 14 #include "ash/shelf/shelf.h" |
14 #include "ash/shelf/shelf_layout_manager.h" | 15 #include "ash/shelf/shelf_layout_manager.h" |
15 #include "ash/shelf/shelf_menu_model.h" | |
16 #include "ash/shelf/shelf_widget.h" | 16 #include "ash/shelf/shelf_widget.h" |
17 #include "ash/shell.h" | 17 #include "ash/shell.h" |
18 #include "base/strings/string_util.h" | 18 #include "base/strings/string_util.h" |
19 #include "components/mus/public/cpp/property_type_converters.h" | 19 #include "components/mus/public/cpp/property_type_converters.h" |
20 #include "components/mus/public/cpp/window.h" | 20 #include "components/mus/public/cpp/window.h" |
21 #include "components/mus/public/cpp/window_property.h" | 21 #include "components/mus/public/cpp/window_property.h" |
22 #include "mojo/common/common_type_converters.h" | 22 #include "mojo/common/common_type_converters.h" |
23 #include "services/shell/public/cpp/connector.h" | 23 #include "services/shell/public/cpp/connector.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" |
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
472 StatusAreaWidget* status_widget = widget->status_area_widget(); | 472 StatusAreaWidget* status_widget = widget->status_area_widget(); |
473 mus::Window* status_window = | 473 mus::Window* status_window = |
474 aura::GetMusWindow(status_widget->GetNativeWindow()); | 474 aura::GetMusWindow(status_widget->GetNativeWindow()); |
475 gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size(); | 475 gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size(); |
476 status_window->SetSharedProperty<gfx::Size>( | 476 status_window->SetSharedProperty<gfx::Size>( |
477 mus::mojom::WindowManager::kPreferredSize_Property, status_size); | 477 mus::mojom::WindowManager::kPreferredSize_Property, status_size); |
478 } | 478 } |
479 | 479 |
480 } // namespace sysui | 480 } // namespace sysui |
481 } // namespace ash | 481 } // namespace ash |
OLD | NEW |