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

Unified Diff: views/controls/menu/menu_item_view.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/menu/menu_controller.cc ('k') | views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_item_view.cc
===================================================================
--- views/controls/menu/menu_item_view.cc (revision 86083)
+++ views/controls/menu/menu_item_view.cc (working copy)
@@ -40,7 +40,7 @@
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);
}
@@ -441,7 +441,7 @@
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)
@@ -555,7 +555,7 @@
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();
@@ -648,11 +648,11 @@
// 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;
« no previous file with comments | « views/controls/menu/menu_controller.cc ('k') | views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698