Updating MakeMenuItemStringsFor() to include separators in custom items

content/shell/renderer/test_runner/event_sender.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/renderer/test_runner/event_sender.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/common/page_zoom.h"
@@ skipping 106 matching lines @@
   }
   return GetKeyModifiers(modifier_names);
 }
 
 // Maximum distance (in space and time) for a mouse click to register as a
 // double or triple click.
 const double kMultipleClickTimeSec = 1;
 const int kMultipleClickRadiusPixels = 5;
 const char kSubMenuDepthIdentifier[] = "_";
 const char kSubMenuIdentifier[] = " >";
+const char kSeparatorIdentifier[] = "Separator";

[tkent, 2014/08/25 20:20:53]

I prefer that the string look special, rather than a normal word.
e.g.
"[separator]"
" ---- "

 
 bool OutsideMultiClickRadius(const WebPoint& a, const WebPoint& b) {
   return ((a.x - b.x) * (a.x - b.x) + (a.y - b.y) * (a.y - b.y)) >
          kMultipleClickRadiusPixels * kMultipleClickRadiusPixels;
 }
 
 void PopulateCustomItems(const WebVector<WebMenuItemInfo>& customItems,
     const std::string& prefix, std::vector<std::string>* strings) {
   for (size_t i = 0; i < customItems.size(); ++i) {
-    if (customItems[i].type == blink::WebMenuItemInfo::SubMenu) {
+    if (customItems[i].type == blink::WebMenuItemInfo::Separator) {
+      strings->push_back(prefix + kSeparatorIdentifier);
+    } else if (customItems[i].type == blink::WebMenuItemInfo::SubMenu) {
       strings->push_back(prefix + customItems[i].label.utf8() +
           kSubMenuIdentifier);
       PopulateCustomItems(customItems[i].subMenuItems, prefix +
           kSubMenuDepthIdentifier, strings);
     } else {
       strings->push_back(prefix + customItems[i].label.utf8());
     }
   }
 }
 
@@ skipping 2141 matching lines @@
       }
       default:
         NOTREACHED();
     }
   }
 
   replaying_saved_events_ = false;
 }
 
 }  // namespace content