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

Side by Side Diff: webkit/glue/webmenuitem.h

Issue 13219005: Replace string16 with base::string16 in src/webkit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef WEBMENUITEM_H_ 5 #ifndef WEBMENUITEM_H_
6 #define WEBMENUITEM_H_ 6 #define WEBMENUITEM_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/string16.h" 10 #include "base/string16.h.h"
11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h" 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMenuItemInfo.h"
12 #include "webkit/glue/webkit_glue_export.h" 12 #include "webkit/glue/webkit_glue_export.h"
13 13
14 // Container for information about entries in an HTML select popup menu and 14 // Container for information about entries in an HTML select popup menu and
15 // custom entries of the context menu. 15 // custom entries of the context menu.
16 struct WEBKIT_GLUE_EXPORT WebMenuItem { 16 struct WEBKIT_GLUE_EXPORT WebMenuItem {
17 enum Type { 17 enum Type {
18 OPTION = WebKit::WebMenuItemInfo::Option, 18 OPTION = WebKit::WebMenuItemInfo::Option,
19 CHECKABLE_OPTION = WebKit::WebMenuItemInfo::CheckableOption, 19 CHECKABLE_OPTION = WebKit::WebMenuItemInfo::CheckableOption,
20 GROUP = WebKit::WebMenuItemInfo::Group, 20 GROUP = WebKit::WebMenuItemInfo::Group,
21 SEPARATOR = WebKit::WebMenuItemInfo::Separator, 21 SEPARATOR = WebKit::WebMenuItemInfo::Separator,
22 SUBMENU // This is currently only used by Pepper, not by WebKit. 22 SUBMENU // This is currently only used by Pepper, not by WebKit.
23 }; 23 };
24 24
25 WebMenuItem(); 25 WebMenuItem();
26 WebMenuItem(const WebKit::WebMenuItemInfo& item); 26 WebMenuItem(const WebKit::WebMenuItemInfo& item);
27 WebMenuItem(const WebMenuItem& item); 27 WebMenuItem(const WebMenuItem& item);
28 ~WebMenuItem(); 28 ~WebMenuItem();
29 29
30 string16 label; 30 base::string16 label;
31 string16 toolTip; 31 base::string16 toolTip;
32 Type type; 32 Type type;
33 unsigned action; 33 unsigned action;
34 bool rtl; 34 bool rtl;
35 bool has_directional_override; 35 bool has_directional_override;
36 bool enabled; 36 bool enabled;
37 bool checked; 37 bool checked;
38 std::vector<WebMenuItem> submenu; 38 std::vector<WebMenuItem> submenu;
39 }; 39 };
40 40
41 #endif // WEBMENUITEM_H_ 41 #endif // WEBMENUITEM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698