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

Side by Side Diff: Source/platform/ContextMenuItem.cpp

Issue 802233004: Implement icon attribute for menuitem (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: LayoutTest rebase Created 5 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
« no previous file with comments | « Source/platform/ContextMenuItem.h ('k') | Source/web/ContextMenuClientImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 12 matching lines...) Expand all
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "platform/ContextMenuItem.h" 27 #include "platform/ContextMenuItem.h"
28 28
29 #include "platform/ContextMenu.h" 29 #include "platform/ContextMenu.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction act ion, const String& title, ContextMenu* subMenu) 33 ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction act ion, const String& title, const String& icon, ContextMenu* subMenu)
34 : m_type(type) 34 : m_type(type)
35 , m_action(action) 35 , m_action(action)
36 , m_title(title) 36 , m_title(title)
37 , m_icon(icon)
37 , m_enabled(true) 38 , m_enabled(true)
38 , m_checked(false) 39 , m_checked(false)
39 { 40 {
40 if (subMenu) 41 if (subMenu)
41 setSubMenu(subMenu); 42 setSubMenu(subMenu);
42 } 43 }
43 44
44 ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction act ion, const String& title, bool enabled, bool checked) 45 ContextMenuItem::ContextMenuItem(ContextMenuItemType type, ContextMenuAction act ion, const String& title, const String& icon, bool enabled, bool checked)
45 : m_type(type) 46 : m_type(type)
46 , m_action(action) 47 , m_action(action)
47 , m_title(title) 48 , m_title(title)
49 , m_icon(icon)
48 , m_enabled(enabled) 50 , m_enabled(enabled)
49 , m_checked(checked) 51 , m_checked(checked)
50 { 52 {
51 } 53 }
52 54
53 ContextMenuItem::ContextMenuItem(ContextMenuAction action, const String& title, bool enabled, bool checked, const Vector<ContextMenuItem>& subMenuItems) 55 ContextMenuItem::ContextMenuItem(ContextMenuAction action, const String& title, bool enabled, bool checked, const Vector<ContextMenuItem>& subMenuItems)
54 : m_type(SubmenuType) 56 : m_type(SubmenuType)
55 , m_action(action) 57 , m_action(action)
56 , m_title(title) 58 , m_title(title)
57 , m_enabled(enabled) 59 , m_enabled(enabled)
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 { 111 {
110 m_enabled = enabled; 112 m_enabled = enabled;
111 } 113 }
112 114
113 bool ContextMenuItem::enabled() const 115 bool ContextMenuItem::enabled() const
114 { 116 {
115 return m_enabled; 117 return m_enabled;
116 } 118 }
117 119
118 } // namespace blink 120 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/ContextMenuItem.h ('k') | Source/web/ContextMenuClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698