| Index: ui/views/view.cc
|
| diff --git a/ui/views/view.cc b/ui/views/view.cc
|
| index f1e33659d6f4d7bd6174a7bcfee1f0e65705520d..0f4386cec52d87af1db7beebc7f0b705942783f4 100644
|
| --- a/ui/views/view.cc
|
| +++ b/ui/views/view.cc
|
| @@ -105,7 +105,7 @@ bool View::IsHotTracked() const {
|
| // Creation and lifetime -------------------------------------------------------
|
|
|
| View::View()
|
| - : parent_owned_(true),
|
| + : owned_by_parent_(true),
|
| id_(0),
|
| group_(-1),
|
| parent_(NULL),
|
| @@ -135,7 +135,7 @@ View::~View() {
|
|
|
| for (Views::const_iterator i(children_.begin()); i != children_.end(); ++i) {
|
| (*i)->parent_ = NULL;
|
| - if ((*i)->parent_owned())
|
| + if ((*i)->owned_by_parent_)
|
| delete *i;
|
| }
|
|
|
| @@ -1547,7 +1547,7 @@ void View::DoRemoveChildView(View* view,
|
| view->parent_ = NULL;
|
| view->UpdateLayerVisibility();
|
|
|
| - if (delete_removed_view && view->parent_owned())
|
| + if (delete_removed_view && view->owned_by_parent_)
|
| view_to_be_deleted.reset(view);
|
|
|
| children_.erase(i);
|
|
|