| Index: views/controls/tabbed_pane/native_tabbed_pane_win.cc
|
| ===================================================================
|
| --- views/controls/tabbed_pane/native_tabbed_pane_win.cc (revision 92600)
|
| +++ views/controls/tabbed_pane/native_tabbed_pane_win.cc (working copy)
|
| @@ -57,7 +57,7 @@
|
| // Switches to the tab page identified by the given index.
|
| void SwitchToPage(View* host, View* page) {
|
| for (int i = 0; i < host->child_count(); ++i) {
|
| - View* child = host->GetChildViewAt(i);
|
| + View* child = host->child_at(i);
|
| // The child might not have been laid out yet.
|
| if (child == page)
|
| child->SetBoundsRect(host->GetContentsBounds());
|
| @@ -77,7 +77,7 @@
|
| virtual void Layout(View* host) {
|
| gfx::Rect bounds(host->GetContentsBounds());
|
| for (int i = 0; i < host->child_count(); ++i) {
|
| - View* child = host->GetChildViewAt(i);
|
| + View* child = host->child_at(i);
|
| // We only layout visible children, since it may be expensive.
|
| if (child->IsVisible() && child->bounds() != bounds)
|
| child->SetBoundsRect(bounds);
|
| @@ -88,7 +88,7 @@
|
| // First, query the preferred sizes to determine a good width.
|
| int width = 0;
|
| for (int i = 0; i < host->child_count(); ++i) {
|
| - View* page = host->GetChildViewAt(i);
|
| + View* page = host->child_at(i);
|
| width = std::max(width, page->GetPreferredSize().width());
|
| }
|
| // After we know the width, decide on the height.
|
| @@ -98,7 +98,7 @@
|
| virtual int GetPreferredHeightForWidth(View* host, int width) {
|
| int height = 0;
|
| for (int i = 0; i < host->child_count(); ++i) {
|
| - View* page = host->GetChildViewAt(i);
|
| + View* page = host->child_at(i);
|
| height = std::max(height, page->GetHeightForWidth(width));
|
| }
|
| return height;
|
|
|