diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 21:09:46 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 21:09:46 +0000 |
| commit | 5a9de31f01f29f0a2c754598a7f4c7eea7c3771e (patch) | |
| tree | abfc3cdb052e57dc7d3bdfd9cbbb15ac55351dc0 /ash | |
| parent | 8c1e91b079517e00fb2d8e58594524e798aa08b6 (diff) | |
| download | chromium_src-5a9de31f01f29f0a2c754598a7f4c7eea7c3771e.zip chromium_src-5a9de31f01f29f0a2c754598a7f4c7eea7c3771e.tar.gz chromium_src-5a9de31f01f29f0a2c754598a7f4c7eea7c3771e.tar.bz2 | |
views cleanup: Merge parent and parent_widget.
According to Ben, parent_widget is a leftover from when we had
NativeViewGtk. It isn't needed now and everything should be handleable
by the normal parent.
BUG=161882
Review URL: https://chromiumcodereview.appspot.com/11299317
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/extended_desktop_unittest.cc | 3 | ||||
| -rw-r--r-- | ash/tooltips/tooltip_controller_unittest.cc | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc index d43fe02..c153a60 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_unittest.cc @@ -37,7 +37,8 @@ views::Widget* CreateTestWidgetWithParent(views::Widget* parent, const gfx::Rect& bounds, bool child) { views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW); - params.parent_widget = parent; + if (parent) + params.parent = parent->GetNativeView(); params.bounds = bounds; params.child = child; views::Widget* widget = new views::Widget; diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index 8a31c32..a4b2be3 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -52,7 +52,6 @@ views::Widget* CreateNewWidgetWithBoundsOn(int display, params.accept_events = true; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.context = Shell::GetAllRootWindows().at(display); - params.parent_widget = NULL; params.child = true; params.bounds = bounds; widget->Init(params); |