Chromium Code Reviews Chromium Code Reviews
Issue 840453003:
Prepare blink to support testing of icon attribute for <menuitem>. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 #ifndef WebMenuItemInfo_h | 31 #ifndef WebMenuItemInfo_h |
| 32 #define WebMenuItemInfo_h | 32 #define WebMenuItemInfo_h |
| 33 | 33 |
| 34 #include "../platform/WebCommon.h" | 34 #include "../platform/WebCommon.h" |
| 35 #include "../platform/WebString.h" | 35 #include "../platform/WebString.h" |
| 36 #include "../platform/WebVector.h" | 36 #include "../platform/WebVector.h" |
| 37 #include "WebTextDirection.h" | 37 #include "WebTextDirection.h" |
| 38 | 38 |
| 39 namespace blink { | 39 namespace blink { |
| 40 | 40 |
| 41 struct WebMenuItemInfo { | 41 struct WebMenuItemInfo { |
|
chrishtr
2015/01/06 18:13:45
Is this whole struct just for testing?
pals
2015/01/07 05:31:32
No, this is not only for testing. This is used as
| |
| 42 enum Type { | 42 enum Type { |
| 43 Option, | 43 Option, |
| 44 CheckableOption, | 44 CheckableOption, |
| 45 Group, | 45 Group, |
| 46 Separator, | 46 Separator, |
| 47 SubMenu | 47 SubMenu |
| 48 }; | 48 }; |
| 49 | 49 |
| 50 WebMenuItemInfo() | 50 WebMenuItemInfo() |
| 51 : type(Option) | 51 : type(Option) |
| 52 , action(0) | 52 , action(0) |
| 53 , textDirection(WebTextDirectionDefault) | 53 , textDirection(WebTextDirectionDefault) |
| 54 , hasTextDirectionOverride(false) | 54 , hasTextDirectionOverride(false) |
| 55 , enabled(false) | 55 , enabled(false) |
| 56 , checked(false) | 56 , checked(false) |
| 57 { | 57 { |
| 58 } | 58 } |
| 59 | 59 |
| 60 WebString label; | 60 WebString label; |
| 61 WebString icon; | |
|
tkent
2015/02/02 00:35:41
This should have a comment explaining the content
| |
| 61 WebString toolTip; | 62 WebString toolTip; |
| 62 Type type; | 63 Type type; |
| 63 unsigned action; | 64 unsigned action; |
| 64 WebTextDirection textDirection; | 65 WebTextDirection textDirection; |
| 65 WebVector<WebMenuItemInfo> subMenuItems; | 66 WebVector<WebMenuItemInfo> subMenuItems; |
| 66 bool hasTextDirectionOverride; | 67 bool hasTextDirectionOverride; |
| 67 bool enabled; | 68 bool enabled; |
| 68 bool checked; | 69 bool checked; |
| 69 }; | 70 }; |
| 70 | 71 |
| 71 } // namespace blink | 72 } // namespace blink |
| 72 | 73 |
| 73 #endif | 74 #endif |
| OLD | NEW |
