views: Convert View::GetID/SetID functions to unix_hacker style.

BUG=72040
TEST=None

R=ben@chromium.org

Review URL: http://codereview.chromium.org/6969087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87791 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 14 deletions

diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 573ffe3..70f1a8b 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -714,7 +714,7 @@ int MenuController::OnPerformDrop(SubmenuView* source,
   // 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(
@@ -1130,11 +1130,11 @@ 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;
@@ -1143,7 +1143,7 @@ MenuItemView* MenuController::GetMenuItemAt(View* source, int x, int y) {
 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;
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index 8c0e07e..beee1b3 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -12,8 +12,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/canvas.h"
-#include "views/controls/button/text_button.h"
 #include "views/controls/button/menu_button.h"
+#include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_separator.h"
@@ -38,7 +38,7 @@ class EmptyMenuMenuItem : public MenuItemView {
   explicit EmptyMenuMenuItem(MenuItemView* parent)
       : MenuItemView(parent, 0, EMPTY) {
     // Set this so that we're not identified as a normal menu item.
-    SetID(kEmptyMenuItemViewID);
+    set_id(kEmptyMenuItemViewID);
     SetTitle(UTF16ToWide(
         l10n_util::GetStringUTF16(IDS_APP_MENU_EMPTY_SUBMENU)));
     SetEnabled(false);
@@ -445,7 +445,7 @@ MenuItemView* MenuItemView::GetMenuItemByID(int id) {
     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)
@@ -561,7 +561,7 @@ void MenuItemView::Init(MenuItemView* parent,
   submenu_ = NULL;
   show_mnemonics_ = false;
   // Assign our ID, this allows SubmenuItemView to find MenuItemViews.
-  SetID(kMenuItemViewID);
+  set_id(kMenuItemViewID);
   has_icons_ = false;
 
   // Don't request enabled status from the root menu item as it is just
@@ -656,11 +656,11 @@ void MenuItemView::RemoveEmptyMenus() {
   // 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;
@@ -742,7 +742,7 @@ int MenuItemView::GetChildPreferredWidth() {
 }
 
 string16 MenuItemView::GetAcceleratorText() {
-  if (GetID() == kEmptyMenuItemViewID) {
+  if (id() == kEmptyMenuItemViewID) {
     // Don't query the delegate for menus that represent no children.
     return string16();
   }
diff --git a/views/controls/menu/submenu_view.cc b/views/controls/menu/submenu_view.cc
index 57ab1e3..84e4cd1 100644
--- a/views/controls/menu/submenu_view.cc
+++ b/views/controls/menu/submenu_view.cc
@@ -55,7 +55,7 @@ SubmenuView::~SubmenuView() {
 int SubmenuView::GetMenuItemCount() {
   int count = 0;
   for (int i = 0; i < child_count(); ++i) {
-    if (GetChildViewAt(i)->GetID() == MenuItemView::kMenuItemViewID)
+    if (GetChildViewAt(i)->id() == MenuItemView::kMenuItemViewID)
       count++;
   }
   return count;
@@ -63,7 +63,7 @@ int SubmenuView::GetMenuItemCount() {
 
 MenuItemView* SubmenuView::GetMenuItemAt(int index) {
   for (int i = 0, count = 0; i < child_count(); ++i) {
-    if (GetChildViewAt(i)->GetID() == MenuItemView::kMenuItemViewID &&
+    if (GetChildViewAt(i)->id() == MenuItemView::kMenuItemViewID &&
         count++ == index) {
       return static_cast<MenuItemView*>(GetChildViewAt(i));
     }
@@ -113,7 +113,7 @@ gfx::Size SubmenuView::GetPreferredSize() {
         child->GetPreferredSize() : gfx::Size();
     max_width = std::max(max_width, child_pref_size.width());
     height += child_pref_size.height();
-    if (child->GetID() == MenuItemView::kMenuItemViewID) {
+    if (child->id() == MenuItemView::kMenuItemViewID) {
       MenuItemView* menu = static_cast<MenuItemView*>(child);
       max_accelerator_width_ =
           std::max(max_accelerator_width_, menu->GetAcceleratorTextWidth());