diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 19:51:25 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 19:51:25 +0000 |
commit | 958d3b6a8536203ad30439eeee82fb280150c15e (patch) | |
tree | 5548c8affb44ebf50e7598e7ec4fedfa366b1314 /views/view_unittest.cc | |
parent | 217d63f8020735f190237b3cfc337a794df1d212 (diff) | |
download | chromium_src-958d3b6a8536203ad30439eeee82fb280150c15e.zip chromium_src-958d3b6a8536203ad30439eeee82fb280150c15e.tar.gz chromium_src-958d3b6a8536203ad30439eeee82fb280150c15e.tar.bz2 |
Revert 89216 - Move private NativeWidget methods to new internal interface NativeWidgetPrivate.
This should make it harder to abuse accidentally.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/7170019
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/7097016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view_unittest.cc')
-rw-r--r-- | views/view_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 65c704c..3ffd2f5 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -1510,14 +1510,14 @@ class TestChangeNativeViewHierarchy { void CheckEnumeratingNativeWidgets() { if (!host_->GetTopLevelWidget()) return; - Widget::Widgets widgets; - Widget::GetAllChildWidgets(host_->GetNativeView(), &widgets); + NativeWidget::NativeWidgets widgets; + NativeWidget::GetAllNativeWidgets(host_->GetNativeView(), &widgets); EXPECT_EQ(TestNativeViewHierarchy::kTotalViews + 1, widgets.size()); // Unfortunately there is no guarantee the sequence of views here so always // go through all of them. - for (Widget::Widgets::iterator i = widgets.begin(); + for (NativeWidget::NativeWidgets::iterator i = widgets.begin(); i != widgets.end(); ++i) { - View* root_view = (*i)->GetRootView(); + View* root_view = (*i)->GetWidget()->GetRootView(); if (host_->GetRootView() == root_view) continue; size_t j; |