Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3323)

Unified Diff: ash/mus/bridge/wm_window_mus.cc

Issue 2350953009: Centralizes more shared code between ash and mash (Closed)
Patch Set: moar Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/mus/bridge/wm_window_mus.cc
diff --git a/ash/mus/bridge/wm_window_mus.cc b/ash/mus/bridge/wm_window_mus.cc
index d3fc487382eb1c649522c705c776f28c6317c001..d9af4c010562affe12c446ae7816668e2e99e180 100644
--- a/ash/mus/bridge/wm_window_mus.cc
+++ b/ash/mus/bridge/wm_window_mus.cc
@@ -161,6 +161,7 @@ bool WmWindowMus::IsContainer() const {
}
void WmWindowMus::Destroy() {
+ // TODO(sky): to match aura behavior this should delete children.
James Cook 2016/09/21 22:03:19 Are we going to leak windows at shutdown until thi
sky 2016/09/21 22:47:49 Indeed. Added pointer to bug.
window_->Destroy();
// WARNING: this has been deleted.
}
@@ -444,6 +445,10 @@ void WmWindowMus::AddChild(WmWindow* window) {
window_->AddChild(GetMusWindow(window));
}
+void WmWindowMus::RemoveChild(WmWindow* child) {
+ window_->RemoveChild(GetMusWindow(child));
+}
+
const WmWindow* WmWindowMus::GetParent() const {
return Get(window_->parent());
}

Powered by Google App Engine
This is Rietveld 408576698