Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6609)

Unified Diff: chrome/browser/ui/views/frame/browser_view_layout.cc

Issue 7349021: Convert some more view methods to the ui/views style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_view_layout.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_view_layout.cc (revision 92600)
+++ chrome/browser/ui/views/frame/browser_view_layout.cc (working copy)
@@ -546,7 +546,7 @@
views::SingleSplitView* sidebar_split = browser_view_->sidebar_split_;
if (sidebar_split) {
- DCHECK(sidebar_split == contents_split_->GetChildViewAt(0));
+ DCHECK(sidebar_split == contents_split_->child_at(0));
sidebar_split->CalculateChildrenBounds(
sidebar_split_bounds, &contents_bounds, &sidebar_bounds);
} else {
@@ -599,14 +599,14 @@
return 0;
}
- if (contents_split_->GetChildViewAt(1) &&
- contents_split_->GetChildViewAt(1)->IsVisible())
+ if (contents_split_->child_at(1) &&
+ contents_split_->child_at(1)->IsVisible())
return 0;
if (SidebarManager::IsSidebarAllowed()) {
- views::View* sidebar_split = contents_split_->GetChildViewAt(0);
- if (sidebar_split->GetChildViewAt(1) &&
- sidebar_split->GetChildViewAt(1)->IsVisible())
+ views::View* sidebar_split = contents_split_->child_at(0);
+ if (sidebar_split->child_count() >= 2 &&
+ sidebar_split->child_at(1)->IsVisible())
return 0;
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/infobars/infobar_container_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698