Chromium Code Reviews| Index: mojo/services/public/cpp/view_manager/lib/view.cc |
| diff --git a/mojo/services/public/cpp/view_manager/lib/view.cc b/mojo/services/public/cpp/view_manager/lib/view.cc |
| index 84a0455a9dfeab31aae0d1b27483a9ae21fb7e58..b371000ee798c25e46bd83667c09743b52a1dec6 100644 |
| --- a/mojo/services/public/cpp/view_manager/lib/view.cc |
| +++ b/mojo/services/public/cpp/view_manager/lib/view.cc |
| @@ -311,6 +311,10 @@ void View::Reorder(View* relative, OrderDirection direction) { |
| } |
| bool View::Contains(View* child) const { |
| + if (!child) |
| + return false; |
| + if (child == this) |
|
Elliot Glaysher
2014/11/06 21:29:55
This comes from aura: an aura window says it conta
|
| + return true; |
| if (manager_) |
| CHECK_EQ(ViewPrivate(child).view_manager(), manager_); |
| for (View* p = child->parent(); p; p = p->parent()) { |