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

Unified Diff: views/controls/menu/menu_controller.cc

Issue 7057014: Variety of tweaks to View API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 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
« no previous file with comments | « views/controls/link.cc ('k') | views/controls/menu/menu_item_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_controller.cc
===================================================================
--- views/controls/menu/menu_controller.cc (revision 86083)
+++ views/controls/menu/menu_controller.cc (working copy)
@@ -714,7 +714,7 @@
// WARNING: the call to MenuClosed deletes us.
// If over an empty menu item, drop occurs on the parent.
- if (drop_target->GetID() == MenuItemView::kEmptyMenuItemViewID)
+ if (drop_target->id() == MenuItemView::kEmptyMenuItemViewID)
drop_target = drop_target->GetParentMenuItem();
return drop_target->GetDelegate()->OnPerformDrop(
@@ -1123,11 +1123,11 @@
// Walk the view hierarchy until we find a menu item (or the root).
View* child_under_mouse = source->GetEventHandlerForPoint(gfx::Point(x, y));
while (child_under_mouse &&
- child_under_mouse->GetID() != MenuItemView::kMenuItemViewID) {
+ child_under_mouse->id() != MenuItemView::kMenuItemViewID) {
child_under_mouse = child_under_mouse->parent();
}
if (child_under_mouse && child_under_mouse->IsEnabled() &&
- child_under_mouse->GetID() == MenuItemView::kMenuItemViewID) {
+ child_under_mouse->id() == MenuItemView::kMenuItemViewID) {
return static_cast<MenuItemView*>(child_under_mouse);
}
return NULL;
@@ -1136,7 +1136,7 @@
MenuItemView* MenuController::GetEmptyMenuItemAt(View* source, int x, int y) {
View* child_under_mouse = source->GetEventHandlerForPoint(gfx::Point(x, y));
if (child_under_mouse &&
- child_under_mouse->GetID() == MenuItemView::kEmptyMenuItemViewID) {
+ child_under_mouse->id() == MenuItemView::kEmptyMenuItemViewID) {
return static_cast<MenuItemView*>(child_under_mouse);
}
return NULL;
@@ -1579,7 +1579,7 @@
if (index == start_index)
return NULL;
MenuItemView* child = parent->GetSubmenu()->GetMenuItemAt(index);
- if (child->IsVisible())
+ if (child->visible())
return child;
} while (index != start_index);
return NULL;
@@ -1621,7 +1621,7 @@
for (int i = 0, menu_item_count = submenu->GetMenuItemCount();
i < menu_item_count; ++i) {
MenuItemView* child = submenu->GetMenuItemAt(i);
- if (child->IsEnabled() && child->IsVisible()) {
+ if (child->IsEnabled() && child->visible()) {
if (child == pending_state_.item)
details.index_of_item = i;
if (match_function(child, key)) {
« no previous file with comments | « views/controls/link.cc ('k') | views/controls/menu/menu_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698