Index: chrome/browser/ui/views/toolbar_view.cc |
=================================================================== |
--- chrome/browser/ui/views/toolbar_view.cc (revision 86083) |
+++ chrome/browser/ui/views/toolbar_view.cc (working copy) |
@@ -92,7 +92,7 @@ |
profile_(NULL), |
browser_(browser), |
profiles_menu_contents_(NULL) { |
- SetID(VIEW_ID_TOOLBAR); |
+ set_id(VIEW_ID_TOOLBAR); |
browser_->command_updater()->AddCommandObserver(IDC_BACK, this); |
browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this); |
@@ -133,7 +133,7 @@ |
back_->SetTooltipText( |
UTF16ToWide(l10n_util::GetStringUTF16(IDS_TOOLTIP_BACK))); |
back_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_BACK)); |
- back_->SetID(VIEW_ID_BACK_BUTTON); |
+ back_->set_id(VIEW_ID_BACK_BUTTON); |
forward_ = new views::ButtonDropDown(this, forward_menu_model_.get()); |
forward_->set_triggerable_event_flags(ui::EF_LEFT_BUTTON_DOWN | |
@@ -142,7 +142,7 @@ |
forward_->SetTooltipText( |
UTF16ToWide(l10n_util::GetStringUTF16(IDS_TOOLTIP_FORWARD))); |
forward_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FORWARD)); |
- forward_->SetID(VIEW_ID_FORWARD_BUTTON); |
+ forward_->set_id(VIEW_ID_FORWARD_BUTTON); |
// Have to create this before |reload_| as |reload_|'s constructor needs it. |
location_bar_ = new LocationBarView(profile, browser_, |
@@ -156,7 +156,7 @@ |
reload_->SetTooltipText( |
UTF16ToWide(l10n_util::GetStringUTF16(IDS_TOOLTIP_RELOAD))); |
reload_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_RELOAD)); |
- reload_->SetID(VIEW_ID_RELOAD_BUTTON); |
+ reload_->set_id(VIEW_ID_RELOAD_BUTTON); |
home_ = new views::ImageButton(this); |
home_->set_triggerable_event_flags(ui::EF_LEFT_BUTTON_DOWN | |
@@ -165,7 +165,7 @@ |
home_->SetTooltipText( |
UTF16ToWide(l10n_util::GetStringUTF16(IDS_TOOLTIP_HOME))); |
home_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_HOME)); |
- home_->SetID(VIEW_ID_HOME_BUTTON); |
+ home_->set_id(VIEW_ID_HOME_BUTTON); |
browser_actions_ = new BrowserActionsContainer(browser_, this); |
@@ -176,7 +176,7 @@ |
app_menu_->SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16( |
IDS_APPMENU_TOOLTIP, |
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)))); |
- app_menu_->SetID(VIEW_ID_APP_MENU); |
+ app_menu_->set_id(VIEW_ID_APP_MENU); |
// Add any necessary badges to the menu item based on the system state. |
if (IsUpgradeRecommended() || ShouldShowIncompatibilityWarning()) { |
@@ -332,7 +332,7 @@ |
// ToolbarView, views::MenuDelegate implementation: |
void ToolbarView::RunMenu(views::View* source, const gfx::Point& /* pt */) { |
- DCHECK_EQ(VIEW_ID_APP_MENU, source->GetID()); |
+ DCHECK_EQ(VIEW_ID_APP_MENU, source->id()); |
wrench_menu_ = new WrenchMenu(browser_); |
wrench_menu_->Init(wrench_menu_model_.get()); |