Merge Chromium at r11.0.696.0: Initial merge by git

Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d

1 files changed, 37 insertions, 0 deletions

diff --git a/webkit/glue/webmenuitem.cc b/webkit/glue/webmenuitem.cc
new file mode 100644
index 0000000..2a24195
--- /dev/null
+++ b/webkit/glue/webmenuitem.cc
@@ -0,0 +1,37 @@
+// Copyright (c) 2011 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 "webkit/glue/webmenuitem.h"
+
+WebMenuItem::WebMenuItem()
+    : type(OPTION),
+      action(0),
+      rtl(false),
+      has_directional_override(false),
+      enabled(false),
+      checked(false) {
+}
+
+WebMenuItem::WebMenuItem(const WebKit::WebMenuItemInfo& item)
+    : label(item.label),
+      type(static_cast<Type>(item.type)),
+      action(item.action),
+      rtl(item.textDirection == WebKit::WebTextDirectionRightToLeft),
+      has_directional_override(item.hasTextDirectionOverride),
+      enabled(item.enabled),
+      checked(item.checked) {
+}
+
+WebMenuItem::WebMenuItem(const WebMenuItem& item)
+    : label(item.label),
+      type(item.type),
+      action(item.action),
+      rtl(item.rtl),
+      has_directional_override(item.has_directional_override),
+      enabled(item.enabled),
+      checked(item.checked),
+      submenu(item.submenu) {
+}
+
+WebMenuItem::~WebMenuItem() {}