Variety of tweaks to View API.

views/controls/menu/menu_controller.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/menu/menu_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 696 matching lines @@
   // Set state such that we exit.
   showing_ = false;
   exit_type_ = EXIT_ALL;
 
   if (!IsBlockingRun())
     item->GetRootMenuItem()->DropMenuClosed(false);
 
   // 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(
       drop_target, drop_position, event);
 }
 
 void MenuController::OnDragEnteredScrollButton(SubmenuView* source,
                                                bool is_up) {
   MenuPart part;
   part.type = is_up ? MenuPart::SCROLL_UP : MenuPart::SCROLL_DOWN;
@@ skipping 388 matching lines @@
     }
     i->submenu_open = false;
     i->item = last_item;
   }
 }
 
 MenuItemView* MenuController::GetMenuItemAt(View* source, int x, int y) {
   // 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;
 }
 
 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;
 }
 
 bool MenuController::IsScrollButtonAt(SubmenuView* source,
                                       int x,
                                       int y,
                                       MenuPart::Type* part) {
   MenuScrollViewContainer* scroll_view = source->GetScrollViewContainer();
@@ skipping 422 matching lines @@
                                                          int delta) {
   int start_index = index;
   int parent_count = parent->GetSubmenu()->GetMenuItemCount();
   // Loop through the menu items skipping any invisible menus. The loop stops
   // when we wrap or find a visible child.
   do {
     index = (index + delta + parent_count) % parent_count;
     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;
 }
 
 void MenuController::OpenSubmenuChangeSelectionIfCan() {
   MenuItemView* item = pending_state_.item;
   if (item->HasSubmenu()) {
     if (item->GetSubmenu()->GetMenuItemCount() > 0) {
       SetSelection(item->GetSubmenu()->GetMenuItemAt(0),
@@ skipping 21 matching lines @@
     MenuItemView* parent,
     char16 key,
     bool (*match_function)(MenuItemView* menu, char16 mnemonic)) {
   SubmenuView* submenu = parent->GetSubmenu();
   DCHECK(submenu);
   SelectByCharDetails details;
 
   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)) {
         if (details.first_match == -1)
           details.first_match = i;
         else
           details.has_multiple = true;
         if (details.next_match == -1 && details.index_of_item != -1 &&
             i > details.index_of_item)
           details.next_match = i;
@@ skipping 227 matching lines @@
     return;
 
   // Reset the active_mouse_view_ before sending mouse capture lost. That way if
   // it calls back to us, we aren't in a weird state.
   View* active_view = active_mouse_view_;
   active_mouse_view_ = NULL;
   active_view->OnMouseCaptureLost();
 }
 
 }  // namespace views