summaryrefslogtreecommitdiffstats
path: root/views/view_unittest.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-16 17:21:23 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-16 17:21:23 +0000
commit2f2b57b7e32777e656d4dbbbc04cd914d5b94472 (patch)
tree9e925e8063d39c06c4edb068d2f3a371ff395589 /views/view_unittest.cc
parent4e8655deaccc49465a6c18055887d1e0e2501a55 (diff)
downloadchromium_src-2f2b57b7e32777e656d4dbbbc04cd914d5b94472.zip
chromium_src-2f2b57b7e32777e656d4dbbbc04cd914d5b94472.tar.gz
chromium_src-2f2b57b7e32777e656d4dbbbc04cd914d5b94472.tar.bz2
Re-land:
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 Review URL: http://codereview.chromium.org/7189012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89357 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view_unittest.cc')
-rw-r--r--views/view_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 3ffd2f5..65c704c 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -1510,14 +1510,14 @@ class TestChangeNativeViewHierarchy {
void CheckEnumeratingNativeWidgets() {
if (!host_->GetTopLevelWidget())
return;
- NativeWidget::NativeWidgets widgets;
- NativeWidget::GetAllNativeWidgets(host_->GetNativeView(), &widgets);
+ Widget::Widgets widgets;
+ Widget::GetAllChildWidgets(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 (NativeWidget::NativeWidgets::iterator i = widgets.begin();
+ for (Widget::Widgets::iterator i = widgets.begin();
i != widgets.end(); ++i) {
- View* root_view = (*i)->GetWidget()->GetRootView();
+ View* root_view = (*i)->GetRootView();
if (host_->GetRootView() == root_view)
continue;
size_t j;