Index: chrome/browser/ui/views/toolbar/toolbar_action_view.cc |
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc |
index 504616646893820346eda6b837cdad2d55c3b0a2..7ee1abb6a7e42d30adf20d325cb6540a5c24a303 100644 |
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc |
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc |
@@ -86,14 +86,13 @@ void ToolbarActionView::DecorateWantsToRunBorder( |
views::Painter::CreateImageGridPainter(kRaisedImages)); |
} |
-void ToolbarActionView::ViewHierarchyChanged( |
- const ViewHierarchyChangedDetails& details) { |
- if (details.is_add && !called_register_command_ && GetFocusManager()) { |
- view_controller_->RegisterCommand(); |
- called_register_command_ = true; |
- } |
+gfx::Size ToolbarActionView::GetPreferredSize() const { |
+ return gfx::Size(ToolbarActionsBar::IconWidth(false), |
+ ToolbarActionsBar::IconHeight()); |
+} |
- MenuButton::ViewHierarchyChanged(details); |
+const char* ToolbarActionView::GetClassName() const { |
+ return "ToolbarActionView"; |
} |
void ToolbarActionView::OnDragDone() { |
@@ -101,9 +100,14 @@ void ToolbarActionView::OnDragDone() { |
delegate_->OnToolbarActionViewDragDone(); |
} |
-gfx::Size ToolbarActionView::GetPreferredSize() const { |
- return gfx::Size(ToolbarActionsBar::IconWidth(false), |
- ToolbarActionsBar::IconHeight()); |
+void ToolbarActionView::ViewHierarchyChanged( |
+ const ViewHierarchyChangedDetails& details) { |
+ if (details.is_add && !called_register_command_ && GetFocusManager()) { |
+ view_controller_->RegisterCommand(); |
+ called_register_command_ = true; |
+ } |
+ |
+ MenuButton::ViewHierarchyChanged(details); |
} |
void ToolbarActionView::PaintChildren(gfx::Canvas* canvas, |