Variety of tweaks to View API.

views/controls/menu/menu_item_view.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_item_view.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
@@ skipping 22 matching lines @@
 // is itself a MenuItemView, but it uses a different ID so that it isn't
 // identified as a MenuItemView.
 
 class EmptyMenuMenuItem : public MenuItemView {
  public:
   explicit EmptyMenuMenuItem(MenuItemView* parent)
       : MenuItemView(parent, 0, NORMAL) {
     SetTitle(UTF16ToWide(
         l10n_util::GetStringUTF16(IDS_APP_MENU_EMPTY_SUBMENU)));
     // Set this so that we're not identified as a normal menu item.
-    SetID(kEmptyMenuItemViewID);
+    set_id(kEmptyMenuItemViewID);
     SetEnabled(false);
   }
 
   virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
     // Empty menu items shouldn't have a tooltip.
     return false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyMenuMenuItem);
@@ skipping 380 matching lines @@
   return 0;
 }
 
 MenuItemView* MenuItemView::GetMenuItemByID(int id) {
   if (GetCommand() == id)
     return this;
   if (!HasSubmenu())
     return NULL;
   for (int i = 0; i < GetSubmenu()->child_count(); ++i) {
     View* child = GetSubmenu()->GetChildViewAt(i);
-    if (child->GetID() == MenuItemView::kMenuItemViewID) {
+    if (child->id() == MenuItemView::kMenuItemViewID) {
       MenuItemView* result = static_cast<MenuItemView*>(child)->
           GetMenuItemByID(id);
       if (result)
         return result;
     }
   }
   return NULL;
 }
 
 void MenuItemView::ChildrenChanged() {
@@ skipping 93 matching lines @@
   delegate_ = delegate;
   controller_ = NULL;
   canceled_ = false;
   parent_menu_item_ = parent;
   type_ = type;
   selected_ = false;
   command_ = command;
   submenu_ = NULL;
   show_mnemonics_ = false;
   // Assign our ID, this allows SubmenuItemView to find MenuItemViews.
-  SetID(kMenuItemViewID);
+  set_id(kMenuItemViewID);
   has_icons_ = false;
 
   MenuDelegate* root_delegate = GetDelegate();
   if (root_delegate)
     SetEnabled(root_delegate->IsCommandEnabled(command));
 }
 
 void MenuItemView::DropMenuClosed(bool notify_delegate) {
   DCHECK(controller_);
   DCHECK(!controller_->IsBlockingRun());
@@ skipping 72 matching lines @@
     }
   }
 }
 
 void MenuItemView::RemoveEmptyMenus() {
   DCHECK(HasSubmenu());
   // Iterate backwards as we may end up removing views, which alters the child
   // view count.
   for (int i = submenu_->child_count() - 1; i >= 0; --i) {
     View* child = submenu_->GetChildViewAt(i);
-    if (child->GetID() == MenuItemView::kMenuItemViewID) {
+    if (child->id() == MenuItemView::kMenuItemViewID) {
       MenuItemView* menu_item = static_cast<MenuItemView*>(child);
       if (menu_item->HasSubmenu())
         menu_item->RemoveEmptyMenus();
-    } else if (child->GetID() == EmptyMenuMenuItem::kEmptyMenuItemViewID) {
+    } else if (child->id() == EmptyMenuMenuItem::kEmptyMenuItemViewID) {
       submenu_->RemoveChildView(child);
       delete child;
       child = NULL;
     }
   }
 }
 
 void MenuItemView::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
   rect->set_x(GetMirroredXForRect(*rect));
 }
@@ skipping 62 matching lines @@
 }
 
 string16 MenuItemView::GetAcceleratorText() {
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : string16();
 }
 
 }  // namespace views