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

Unified Diff: chrome/browser/ui/views/wrench_menu.cc

Issue 6452011: Rework tree APIs to reflect Google style and more const-correctness.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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/wrench_menu.cc
===================================================================
--- chrome/browser/ui/views/wrench_menu.cc (revision 74117)
+++ chrome/browser/ui/views/wrench_menu.cc (working copy)
@@ -235,9 +235,8 @@
if (!IsVisible())
return;
- if (GetParent()) {
- GetParent()->SchedulePaint(GetMirroredBounds(), urgent);
- }
+ if (parent())
+ parent()->SchedulePaint(GetMirroredBounds(), urgent);
}
private:
@@ -343,13 +342,13 @@
gfx::Size GetPreferredSize() {
// Returned height doesn't matter as MenuItemView forces everything to the
// height of the menuitemview.
- return gfx::Size(GetMaxChildViewPreferredWidth() * GetChildViewCount(), 0);
+ return gfx::Size(GetMaxChildViewPreferredWidth() * child_count(), 0);
}
void Layout() {
// All buttons are given the same width.
int width = GetMaxChildViewPreferredWidth();
- for (int i = 0; i < GetChildViewCount(); ++i)
+ for (size_t i = 0; i < child_count(); ++i)
GetChildViewAt(i)->SetBounds(i * width, 0, width, height());
}
@@ -362,7 +361,7 @@
// Returns the max preferred width of all the children.
int GetMaxChildViewPreferredWidth() {
int width = 0;
- for (int i = 0; i < GetChildViewCount(); ++i)
+ for (size_t i = 0; i < child_count(); ++i)
width = std::max(width, GetChildViewAt(i)->GetPreferredSize().width());
return width;
}

Powered by Google App Engine
This is Rietveld 408576698