| Index: components/renderer_context_menu/views/toolkit_delegate_views.cc
|
| diff --git a/components/renderer_context_menu/views/toolkit_delegate_views.cc b/components/renderer_context_menu/views/toolkit_delegate_views.cc
|
| index 8dcaaf9267ff30804229854a88bbdbfb7ccb418b..08797fb50889aa0cb9d9dc90c01c9366321ef5c6 100644
|
| --- a/components/renderer_context_menu/views/toolkit_delegate_views.cc
|
| +++ b/components/renderer_context_menu/views/toolkit_delegate_views.cc
|
| @@ -5,6 +5,7 @@
|
| #include "components/renderer_context_menu/views/toolkit_delegate_views.h"
|
|
|
| #include "ui/gfx/geometry/rect.h"
|
| +#include "ui/gfx/image/image.h"
|
| #include "ui/views/controls/menu/menu_item_view.h"
|
| #include "ui/views/controls/menu/menu_model_adapter.h"
|
| #include "ui/views/controls/menu/menu_runner.h"
|
| @@ -41,7 +42,8 @@ void ToolkitDelegateViews::Cancel() {
|
| void ToolkitDelegateViews::UpdateMenuItem(int command_id,
|
| bool enabled,
|
| bool hidden,
|
| - const base::string16& title) {
|
| + const base::string16& title,
|
| + gfx::Image* icon) {
|
| views::MenuItemView* item = menu_view_->GetMenuItemByID(command_id);
|
| if (!item)
|
| return;
|
| @@ -49,6 +51,8 @@ void ToolkitDelegateViews::UpdateMenuItem(int command_id,
|
| item->SetEnabled(enabled);
|
| item->SetTitle(title);
|
| item->SetVisible(!hidden);
|
| + if (icon)
|
| + item->SetIcon(*icon->ToImageSkia());
|
|
|
| views::MenuItemView* parent = item->GetParentMenuItem();
|
| if (!parent)
|
| @@ -56,4 +60,3 @@ void ToolkitDelegateViews::UpdateMenuItem(int command_id,
|
|
|
| parent->ChildrenChanged();
|
| }
|
| -
|
|
|