Merge pull request #201 from adobe/glenn/issue-2770

redmunds · redmunds · commit 665450db5eff · 2013-02-01T16:42:21.000-08:00
Revert "Don't create tags for separator items."
diff --git a/appshell/appshell_extensions_mac.mm b/appshell/appshell_extensions_mac.mm
@@ -798,9 +798,7 @@ int32 AddMenuItem(CefRefPtr<CefBrowser> browser, ExtensionString parentCommand,
     }
     int32 tag = NativeMenuModel::getInstance(getMenuParent(browser)).getTag(command);
     if (tag == kTagNotFound) {
-        if (!isSeparator) {
-            tag = NativeMenuModel::getInstance(getMenuParent(browser)).getOrCreateTag(command, parentCommand);
-        }
+        tag = NativeMenuModel::getInstance(getMenuParent(browser)).getOrCreateTag(command, parentCommand);
     } else {
         return NO_ERROR;
     }
diff --git a/appshell/appshell_extensions_win.cpp b/appshell/appshell_extensions_win.cpp
@@ -1249,9 +1249,7 @@ int32 AddMenuItem(CefRefPtr<CefBrowser> browser, ExtensionString parentCommand,
 
     tag = NativeMenuModel::getInstance(getMenuParent(browser)).getTag(command);
     if (tag == kTagNotFound) {
-        if (!isSeparator) {
-            tag = NativeMenuModel::getInstance(getMenuParent(browser)).getOrCreateTag(command, parentCommand);
-        }
+        tag = NativeMenuModel::getInstance(getMenuParent(browser)).getOrCreateTag(command, parentCommand);
     } else {
         return NO_ERROR;
     }

Original file line number	Diff line number	Diff line change
`@@ -798,9 +798,7 @@ int32 AddMenuItem(CefRefPtr<CefBrowser> browser, ExtensionString parentCommand,`
`798`	`798`	`}`
`799`	`799`	`int32 tag = NativeMenuModel::getInstance(getMenuParent(browser)).getTag(command);`
`800`	`800`	`if (tag == kTagNotFound) {`
`801`		`- if (!isSeparator) {`
`802`		`- tag = NativeMenuModel::getInstance(getMenuParent(browser)).getOrCreateTag(command, parentCommand);`
`803`		`- }`
	`801`	`+ tag = NativeMenuModel::getInstance(getMenuParent(browser)).getOrCreateTag(command, parentCommand);`
`804`	`802`	`} else {`
`805`	`803`	`return NO_ERROR;`
`806`	`804`	`}`