| 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/disconnected_app_handler.h" | 5 #include "ash/mus/disconnected_app_handler.h" |
| 6 | 6 |
| 7 #include "ash/public/cpp/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
| 8 #include "ash/wm_window.h" | |
| 9 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" |
| 10 #include "ui/base/class_property.h" | 9 #include "ui/base/class_property.h" |
| 11 | 10 |
| 12 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::mus::DisconnectedAppHandler*); | 11 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::mus::DisconnectedAppHandler*); |
| 13 | 12 |
| 14 namespace ash { | 13 namespace ash { |
| 15 namespace mus { | 14 namespace mus { |
| 16 namespace { | 15 namespace { |
| 17 | 16 |
| 18 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(DisconnectedAppHandler, | 17 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(DisconnectedAppHandler, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 35 DisconnectedAppHandler::~DisconnectedAppHandler() { | 34 DisconnectedAppHandler::~DisconnectedAppHandler() { |
| 36 window_->RemoveObserver(this); | 35 window_->RemoveObserver(this); |
| 37 } | 36 } |
| 38 | 37 |
| 39 void DisconnectedAppHandler::OnEmbeddedAppDisconnected(aura::Window* window) { | 38 void DisconnectedAppHandler::OnEmbeddedAppDisconnected(aura::Window* window) { |
| 40 delete window_; | 39 delete window_; |
| 41 } | 40 } |
| 42 | 41 |
| 43 } // namespace mus | 42 } // namespace mus |
| 44 } // namespace ash | 43 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2908333003:
[mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
