From 8a9d6ca390c8f43be8e628f047f9140961ba0a79 Mon Sep 17 00:00:00 2001
From: "Takano.Naoki@gmail.com"
 <Takano.Naoki@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 6 Jun 2011 20:11:30 +0000
Subject: Move setToolTipText related functions from RenderView to
 RenderWidget.

WebPopupMenuImpl is derived from WebKit::WebWidget, not WebKit::WebView. So to call setToolTipText() function, we have to move the function from WebKit::WebWidget to WebKit::WebView. This change also includes WebKit change.
 https://bugs.webkit.org/show_bug.cgi?id=61260


BUG=12721
TEST=1, Make html file in BUT=12721. 2, Make sure tooptip is shown.


Review URL: http://codereview.chromium.org/6974007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88023 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/glue/webmenuitem.cc       | 2 ++
 webkit/glue/webmenuitem.h        | 1 +
 webkit/glue/webmenurunner_mac.mm | 4 ++++
 3 files changed, 7 insertions(+)

(limited to 'webkit')

diff --git a/webkit/glue/webmenuitem.cc b/webkit/glue/webmenuitem.cc
index 2a24195..c634314 100644
--- a/webkit/glue/webmenuitem.cc
+++ b/webkit/glue/webmenuitem.cc
@@ -15,6 +15,7 @@ WebMenuItem::WebMenuItem()
 
 WebMenuItem::WebMenuItem(const WebKit::WebMenuItemInfo& item)
     : label(item.label),
+      toolTip(item.toolTip),
       type(static_cast<Type>(item.type)),
       action(item.action),
       rtl(item.textDirection == WebKit::WebTextDirectionRightToLeft),
@@ -25,6 +26,7 @@ WebMenuItem::WebMenuItem(const WebKit::WebMenuItemInfo& item)
 
 WebMenuItem::WebMenuItem(const WebMenuItem& item)
     : label(item.label),
+      toolTip(item.toolTip),
       type(item.type),
       action(item.action),
       rtl(item.rtl),
diff --git a/webkit/glue/webmenuitem.h b/webkit/glue/webmenuitem.h
index 685033e..48f006d 100644
--- a/webkit/glue/webmenuitem.h
+++ b/webkit/glue/webmenuitem.h
@@ -27,6 +27,7 @@ struct WebMenuItem {
   ~WebMenuItem();
 
   string16 label;
+  string16 toolTip;
   Type type;
   unsigned action;
   bool rtl;
diff --git a/webkit/glue/webmenurunner_mac.mm b/webkit/glue/webmenurunner_mac.mm
index 7dce0a6..65fcb7f 100644
--- a/webkit/glue/webmenurunner_mac.mm
+++ b/webkit/glue/webmenurunner_mac.mm
@@ -66,6 +66,10 @@ static NSString* NSWritingDirectionAttributeName = @"NSWritingDirection";
   NSMenuItem* menuItem = [menu_ addItemWithTitle:title
                                           action:@selector(menuItemSelected:)
                                    keyEquivalent:@""];
+  if (!item.toolTip.empty()) {
+    NSString* toolTip = base::SysUTF16ToNSString(item.toolTip);
+    [menuItem setToolTip:toolTip];
+  }
   [menuItem setEnabled:(item.enabled && item.type != WebMenuItem::GROUP)];
   [menuItem setTarget:self];
 
-- 
cgit v1.1