| 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_menu_model.h" | 10 #include "ash/common/shelf/shelf_menu_model.h" |
| 11 #include "ash/common/shelf/shelf_model.h" | 11 #include "ash/common/shelf/shelf_model.h" |
| 12 #include "ash/common/shelf/shelf_types.h" | 12 #include "ash/common/shelf/shelf_types.h" |
| 13 #include "ash/common/system/status_area_widget.h" |
| 13 #include "ash/common/wm_shell.h" | 14 #include "ash/common/wm_shell.h" |
| 14 #include "ash/shelf/shelf.h" | 15 #include "ash/shelf/shelf.h" |
| 15 #include "ash/shelf/shelf_layout_manager.h" | 16 #include "ash/shelf/shelf_layout_manager.h" |
| 16 #include "ash/shelf/shelf_widget.h" | 17 #include "ash/shelf/shelf_widget.h" |
| 17 #include "base/strings/string_util.h" | 18 #include "base/strings/string_util.h" |
| 18 #include "mojo/common/common_type_converters.h" | 19 #include "mojo/common/common_type_converters.h" |
| 19 #include "services/shell/public/cpp/connector.h" | 20 #include "services/shell/public/cpp/connector.h" |
| 20 #include "services/ui/public/cpp/property_type_converters.h" | 21 #include "services/ui/public/cpp/property_type_converters.h" |
| 21 #include "services/ui/public/cpp/window.h" | 22 #include "services/ui/public/cpp/window.h" |
| 22 #include "services/ui/public/cpp/window_property.h" | 23 #include "services/ui/public/cpp/window_property.h" |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 StatusAreaWidget* status_widget = widget->status_area_widget(); | 465 StatusAreaWidget* status_widget = widget->status_area_widget(); |
| 465 ui::Window* status_window = | 466 ui::Window* status_window = |
| 466 aura::GetMusWindow(status_widget->GetNativeWindow()); | 467 aura::GetMusWindow(status_widget->GetNativeWindow()); |
| 467 gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size(); | 468 gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size(); |
| 468 status_window->SetSharedProperty<gfx::Size>( | 469 status_window->SetSharedProperty<gfx::Size>( |
| 469 ui::mojom::WindowManager::kPreferredSize_Property, status_size); | 470 ui::mojom::WindowManager::kPreferredSize_Property, status_size); |
| 470 } | 471 } |
| 471 | 472 |
| 472 } // namespace sysui | 473 } // namespace sysui |
| 473 } // namespace ash | 474 } // namespace ash |
| OLD | NEW |