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

Side by Side Diff: content/renderer/menu_item_builder.cc

Issue 892953002: Show icons for custom menuitems in contextmenu. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/menu_item_builder.h" 5 #include "content/renderer/menu_item_builder.h"
6 6
7 #include "content/public/common/menu_item.h" 7 #include "content/public/common/menu_item.h"
8 #include "url/gurl.h"
8 9
9 namespace content { 10 namespace content {
10 11
11 MenuItem MenuItemBuilder::Build(const blink::WebMenuItemInfo& item) { 12 MenuItem MenuItemBuilder::Build(const blink::WebMenuItemInfo& item) {
12 MenuItem result; 13 MenuItem result;
13 14
14 result.label = item.label; 15 result.label = item.label;
15 result.icon = item.icon; 16 result.icon = GURL(item.icon);
16 result.tool_tip = item.toolTip; 17 result.tool_tip = item.toolTip;
17 result.type = static_cast<MenuItem::Type>(item.type); 18 result.type = static_cast<MenuItem::Type>(item.type);
18 result.action = item.action; 19 result.action = item.action;
19 result.rtl = (item.textDirection == blink::WebTextDirectionRightToLeft); 20 result.rtl = (item.textDirection == blink::WebTextDirectionRightToLeft);
20 result.has_directional_override = item.hasTextDirectionOverride; 21 result.has_directional_override = item.hasTextDirectionOverride;
21 result.enabled = item.enabled; 22 result.enabled = item.enabled;
22 result.checked = item.checked; 23 result.checked = item.checked;
23 for (size_t i = 0; i < item.subMenuItems.size(); ++i) 24 for (size_t i = 0; i < item.subMenuItems.size(); ++i)
24 result.submenu.push_back(MenuItemBuilder::Build(item.subMenuItems[i])); 25 result.submenu.push_back(MenuItemBuilder::Build(item.subMenuItems[i]));
25 26
26 return result; 27 return result;
27 } 28 }
28 29
29 } // namespace content 30 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698