Rollback ContextMenu

third_party/WebKit/Source/bindings/core/v8/custom/V8DevToolsHostCustom.cpp

 /*
  * Copyright (C) 2007-2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 64 matching lines @@
              .ToLocal(&enabled) ||
         !item->Get(context, V8AtomicString(isolate, "checked"))
              .ToLocal(&checked) ||
         !item->Get(context, V8AtomicString(isolate, "subItems"))
              .ToLocal(&sub_items))
       return false;
     if (!type->IsString())
       continue;
     String type_string = ToCoreStringWithNullCheck(type.As<v8::String>());
     if (type_string == "separator") {
-      ContextMenuItem item(ContextMenuItem(kSeparatorType,
-                                           kContextMenuItemCustomTagNoAction,
-                                           String(), String()));
+      ContextMenuItem item(ContextMenuItem(
+          kSeparatorType, kContextMenuItemCustomTagNoAction, String()));
       menu.AppendItem(item);
     } else if (type_string == "subMenu" && sub_items->IsArray()) {
       ContextMenu sub_menu;
       v8::Local<v8::Array> sub_items_array =
           v8::Local<v8::Array>::Cast(sub_items);
       if (!PopulateContextMenuItems(isolate, sub_items_array, sub_menu))
         return false;
       TOSTRING_DEFAULT(V8StringResource<kTreatNullAsNullString>, label_string,
                        label, false);
       ContextMenuItem item(kSubmenuType, kContextMenuItemCustomTagNoAction,
-                           label_string, String(), &sub_menu);
+                           label_string, &sub_menu);
       menu.AppendItem(item);
     } else {
       int32_t int32_id;
       if (!id->Int32Value(context).To(&int32_id))
         return false;
       ContextMenuAction typed_id = static_cast<ContextMenuAction>(
           kContextMenuItemBaseCustomTag + int32_id);
       TOSTRING_DEFAULT(V8StringResource<kTreatNullAsNullString>, label_string,
                        label, false);
       ContextMenuItem menu_item(
           (type_string == "checkbox" ? kCheckableActionType : kActionType),
-          typed_id, label_string, String());
+          typed_id, label_string);
       if (checked->IsBoolean())
         menu_item.SetChecked(checked.As<v8::Boolean>()->Value());
       if (enabled->IsBoolean())
         menu_item.SetEnabled(enabled.As<v8::Boolean>()->Value());
       menu.AppendItem(menu_item);
     }
   }
   return true;
 }
 
@@ skipping 41 matching lines @@
   }
   if (!document || !document->GetFrame())
     return;
 
   DevToolsHost* devtools_host = V8DevToolsHost::toImpl(info.Holder());
   Vector<ContextMenuItem> items = menu.Items();
   devtools_host->ShowContextMenu(document->GetFrame(), x, y, items);
 }
 
 }  // namespace blink