| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/non_client_frame_controller.h" | 5 #include "ash/mus/non_client_frame_controller.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "ash/mus/bridge/wm_window_mus.h" | 13 #include "ash/mus/bridge/wm_window_mus.h" |
| 14 #include "ash/mus/frame/frame_border_hit_test_controller.h" | 14 #include "ash/mus/frame/frame_border_hit_test_controller.h" |
| 15 #include "ash/mus/frame/move_event_handler.h" | 15 #include "ash/mus/frame/move_event_handler.h" |
| 16 #include "ash/mus/frame/non_client_frame_view_mash.h" | 16 #include "ash/mus/frame/non_client_frame_view_mash.h" |
| 17 #include "ash/mus/property_util.h" | 17 #include "ash/mus/property_util.h" |
| 18 #include "ash/mus/shadow.h" | 18 #include "ash/mus/shadow.h" |
| 19 #include "base/macros.h" | 19 #include "base/macros.h" |
| 20 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
| 21 #include "components/mus/public/cpp/property_type_converters.h" | 21 #include "services/ui/public/cpp/property_type_converters.h" |
| 22 #include "components/mus/public/cpp/window.h" | 22 #include "services/ui/public/cpp/window.h" |
| 23 #include "components/mus/public/cpp/window_manager_delegate.h" | 23 #include "services/ui/public/cpp/window_manager_delegate.h" |
| 24 #include "components/mus/public/cpp/window_property.h" | 24 #include "services/ui/public/cpp/window_property.h" |
| 25 #include "components/mus/public/interfaces/window_manager.mojom.h" | 25 #include "services/ui/public/interfaces/window_manager.mojom.h" |
| 26 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | 26 #include "services/ui/public/interfaces/window_tree_host.mojom.h" |
| 27 #include "ui/aura/layout_manager.h" | 27 #include "ui/aura/layout_manager.h" |
| 28 #include "ui/aura/window.h" | 28 #include "ui/aura/window.h" |
| 29 #include "ui/aura/window_tree_host.h" | 29 #include "ui/aura/window_tree_host.h" |
| 30 #include "ui/base/hit_test.h" | 30 #include "ui/base/hit_test.h" |
| 31 #include "ui/compositor/layer.h" | 31 #include "ui/compositor/layer.h" |
| 32 #include "ui/gfx/geometry/vector2d.h" | 32 #include "ui/gfx/geometry/vector2d.h" |
| 33 #include "ui/views/mus/native_widget_mus.h" | 33 #include "ui/views/mus/native_widget_mus.h" |
| 34 #include "ui/views/widget/widget.h" | 34 #include "ui/views/widget/widget.h" |
| 35 | 35 |
| 36 namespace ash { | 36 namespace ash { |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 } | 329 } |
| 330 } | 330 } |
| 331 | 331 |
| 332 void NonClientFrameController::OnWindowDestroyed(::mus::Window* window) { | 332 void NonClientFrameController::OnWindowDestroyed(::mus::Window* window) { |
| 333 window_->RemoveObserver(this); | 333 window_->RemoveObserver(this); |
| 334 window_ = nullptr; | 334 window_ = nullptr; |
| 335 } | 335 } |
| 336 | 336 |
| 337 } // namespace mus | 337 } // namespace mus |
| 338 } // namespace ash | 338 } // namespace ash |
| OLD | NEW |