Commit 2e418fe2 authored by Thomas Lukaszewicz's avatar Thomas Lukaszewicz Committed by Commit Bot

Updated TestChildModalParent to use AddedToWidget()

Removed the use of ViewHierarchyChanged() to update native view
properties when added to a view hierarchy. Changed to use
AddedToWidget() instead.

Currently the logic in ViewHierarchyChanged() requires the view
be in a Widget hierarchy. This should not be assumed in
ViewHierarchyChanged(). Instead, having the logic in AddedToWidget()
helps to make the assumptions more clear.

Bug: 1083822
Change-Id: Ia393fd0141a863212e5c9e30e364fbc4d2b2d7d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2206215Reviewed-by: default avatarRobert Flack <flackr@chromium.org>
Commit-Queue: Thomas Lukaszewicz <tluk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771036}
parent 333915d2
...@@ -138,12 +138,11 @@ void TestChildModalParent::Layout() { ...@@ -138,12 +138,11 @@ void TestChildModalParent::Layout() {
host_->SetBounds(x(), running_y, width(), height() - running_y); host_->SetBounds(x(), running_y, width(), height() - running_y);
} }
void TestChildModalParent::ViewHierarchyChanged( void TestChildModalParent::AddedToWidget() {
const views::ViewHierarchyChangedDetails& details) { // The function requires a Widget be present.
if (details.is_add && details.child == this) { DCHECK(GetWidget());
host_->Attach(modal_parent_->GetNativeView()); host_->Attach(modal_parent_->GetNativeView());
GetWidget()->GetNativeView()->SetName("Parent"); GetWidget()->GetNativeView()->SetName("Parent");
}
} }
void TestChildModalParent::ButtonPressed(views::Button* sender, void TestChildModalParent::ButtonPressed(views::Button* sender,
......
...@@ -42,8 +42,7 @@ class TestChildModalParent : public views::WidgetDelegateView, ...@@ -42,8 +42,7 @@ class TestChildModalParent : public views::WidgetDelegateView,
private: private:
// Overridden from views::View: // Overridden from views::View:
void Layout() override; void Layout() override;
void ViewHierarchyChanged( void AddedToWidget() override;
const views::ViewHierarchyChangedDetails& details) override;
// Overridden from ButtonListener: // Overridden from ButtonListener:
void ButtonPressed(views::Button* sender, const ui::Event& event) override; void ButtonPressed(views::Button* sender, const ui::Event& event) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment