Backout adb23200a7e8 because we shouldn't have landed on relbranch. SEA_COMM150_20120720_RELBRANCH
authorMike Conley <mconley@mozilla.com>
Mon, 23 Jul 2012 15:49:30 -0400
branchSEA_COMM150_20120720_RELBRANCH
changeset 12470 7dbb487e16b27fd1be11281a6dd95f813f1928fe
parent 12469 dd5cbd4b8c7ceda9c1be563bb859e1488e508af7
child 12471 b10eb6edc4cc163ec488f9762c08e42a8da82510
push id610
push usermconley@mozilla.com
push dateMon, 23 Jul 2012 19:52:07 +0000
treeherdercomm-beta@b10eb6edc4cc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
backs outadb23200a7e88bcd09da2252b56fbdaabc81f4f1
Backout adb23200a7e8 because we shouldn't have landed on relbranch.
mail/components/im/content/chat-messenger-overlay.js
mail/components/im/content/chat-messenger-overlay.xul
--- a/mail/components/im/content/chat-messenger-overlay.js
+++ b/mail/components/im/content/chat-messenger-overlay.js
@@ -539,17 +539,16 @@ var chatHandler = {
     else if (item.localName == "imconv") {
       let convDeck = document.getElementById("conversationsDeck");
       if (!item.convView) {
         let conv = document.createElement("imconversation");
         convDeck.appendChild(conv);
         conv.conv = item.conv;
         conv.tab = item;
         conv.setAttribute("contentcontextmenu", "chatConversationContextMenu");
-        conv.setAttribute("contenttooltip", "aHTMLTooltip");
         item.convView = conv;
         document.getElementById("contextSplitter").hidden = false;
         document.getElementById("contextPane").hidden = false;
       }
       else
         item.convView.onConvResize();
 
       convDeck.selectedPanel = item.convView;
--- a/mail/components/im/content/chat-messenger-overlay.xul
+++ b/mail/components/im/content/chat-messenger-overlay.xul
@@ -222,18 +222,17 @@
                 <vbox flex="1" id="noPreviousConvScreen" class="im-placeholder-screen" align="center" pack="center">
                   <hbox id="noPreviousConvBox" class="im-placeholder-box" align="top">
                     <vbox id="noPreviousConvInnerBox" class="im-placeholder-innerbox" flex="1">
                       <description id="noPreviousConvDesc" class="im-placeholder-desc">&chat.noPreviousConv.description;</description>
                     </vbox>
                   </hbox>
                 </vbox>
                 <vbox flex="1" id="logDisplayBrowserBox">
-                  <browser id="conv-log-browser" type="content-conversation" contextmenu="chatConversationContextMenu" flex="1"
-                           tooltip="aHTMLTooltip"/>
+                  <browser id="conv-log-browser" type="content-conversation" contextmenu="chatConversationContextMenu" flex="1"/>
                   <progressmeter id="log-browserProgress" hidden="true"/>
                   <findbar id="log-findbar" browserid="conv-log-browser"/>
                 </vbox>
               </deck>
               <button id="goToConversation" hidden="true"
                       oncommand="chatHandler.showCurrentConversation();"/>
             </vbox>
           </deck>