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

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

Issue 2656043002: Use explicit WebString conversions in remaining content files (Closed)
Patch Set: build fix Created 3 years, 11 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "content/public/common/menu_item.h" 9 #include "content/public/common/menu_item.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 MenuItem MenuItemBuilder::Build(const blink::WebMenuItemInfo& item) { 13 MenuItem MenuItemBuilder::Build(const blink::WebMenuItemInfo& item) {
14 MenuItem result; 14 MenuItem result;
15 15
16 result.label = item.label; 16 result.label = item.label.utf16();
17 result.icon = item.icon; 17 result.icon = item.icon.utf16();
18 result.tool_tip = item.toolTip; 18 result.tool_tip = item.toolTip.utf16();
19 result.type = static_cast<MenuItem::Type>(item.type); 19 result.type = static_cast<MenuItem::Type>(item.type);
20 result.action = item.action; 20 result.action = item.action;
21 result.rtl = (item.textDirection == blink::WebTextDirectionRightToLeft); 21 result.rtl = (item.textDirection == blink::WebTextDirectionRightToLeft);
22 result.has_directional_override = item.hasTextDirectionOverride; 22 result.has_directional_override = item.hasTextDirectionOverride;
23 result.enabled = item.enabled; 23 result.enabled = item.enabled;
24 result.checked = item.checked; 24 result.checked = item.checked;
25 for (size_t i = 0; i < item.subMenuItems.size(); ++i) 25 for (size_t i = 0; i < item.subMenuItems.size(); ++i)
26 result.submenu.push_back(MenuItemBuilder::Build(item.subMenuItems[i])); 26 result.submenu.push_back(MenuItemBuilder::Build(item.subMenuItems[i]));
27 27
28 return result; 28 return result;
29 } 29 }
30 30
31 } // namespace content 31 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698