Bug 165632. Get typeaheadfind into mac build. This does not check it into the mac installer. r=cls, sr=sfraser

build/mac/build_scripts/MozillaBuildFlags.txt

@@ -41,6 +41,7 @@ chrome_jars     1
 chrome_files    0
 use_jars        1
 transformiix    1
+typeaheadfind   1
 mathml          1      MOZ_MATHML
 svg             0      MOZ_SVG
 # svg requires libart, which is an lgpl library. You need to pull it 

build/mac/build_scripts/MozillaBuildList.pm

@@ -159,6 +159,12 @@ sub InstallDefaultsFiles()
       InstallResources(":mozilla:extensions:inspector:resources:content:prefs:MANIFEST", "$default_pref_dir", 0);
     }
 
+    if ($main::options{typeaheadfind})
+    {
+      InstallResources(":mozilla:extensions:typeaheadfind:resources:content:prefs:MANIFEST", "$default_pref_dir", 0);
+    }
+
+
     if ($main::options{mdn}) {
     	InstallResources(":mozilla:mailnews:extensions:mdn:resources:content:MANIFEST_PREFS", "$default_pref_dir", 0);
     }
@@ -271,6 +277,11 @@ sub InstallNonChromeResources()
         InstallResources(":mozilla:extensions:inspector:resources:content:res:MANIFEST",   "$resource_dir" . "inspector:");
     }
     
+    if ($main::options{typeaheadfind})
+    {
+        MakeAlias(":mozilla:extensions:typeaheadfind:resources:locale:en-US:typeaheadfind.properties", "$resource_dir");
+    }
+	
     print("--- End Resource copying ----\n");
 }
 
@@ -572,6 +583,10 @@ sub ProcessJarManifests()
     {
       CreateJarFromManifest(":mozilla:extensions:venkman:resources:jar.mn", $chrome_dir, \%jars);
     }
+    if ($main::options{typeaheadfind})
+    {
+      CreateJarFromManifest(":mozilla:extensions:typeaheadfind:resources:jar.mn", $chrome_dir, \%jars);
+    }
     
     CreateJarFromManifest(":mozilla:accessible:src:base:jar.mn", $chrome_dir, \%jars);
     CreateJarFromManifest(":mozilla:caps:src:jar.mn", $chrome_dir, \%jars);
@@ -1188,6 +1203,12 @@ sub BuildClientDist()
         InstallFromManifest(":mozilla:extensions:inspector:base:public:MANIFEST_IDL", "$distdirectory:idl:");
     }
 
+    #TYPE AHEAD FIND
+    if ($main::options{typeaheadfind})
+    {
+        InstallFromManifest(":mozilla:extensions:typeaheadfind:public:MANIFEST_IDL", "$distdirectory:idl:");
+    }
+
     #P3P
     if ($main::options{p3p})
     {
@@ -1509,6 +1530,11 @@ sub BuildIDLProjects()
         BuildIDLProject(":mozilla:extensions:inspector:macbuild:inspectorIDL.xml", "inspector");
     }
 
+    if ($main::options{typeaheadfind})
+    {
+        BuildIDLProject(":mozilla:extensions:typeaheadfind:macbuild:typeaheadfindIDL.xml", "typeaheadfind");
+    }
+
     if ($main::options{p3p})
     {
         BuildIDLProject(":mozilla:extensions:p3p:macbuild:p3pIDL.xml", "p3p");
@@ -2275,6 +2301,12 @@ sub BuildExtensionsProjects()
         BuildOneProject(":mozilla:extensions:inspector:macbuild:inspector.xml", "inspector$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
     }
     
+    # Type Ahead Find
+    if ($main::options{typeaheadfind})
+    {
+        BuildOneProject(":mozilla:extensions:typeaheadfind:macbuild:typeaheadfind.xml", "typeaheadfind$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
+    }
+    
     # P3P
     if ($main::options{p3p})
     {

extensions/typeaheadfind/src/nsTypeAheadFind.cpp

@@ -572,13 +572,13 @@ nsTypeAheadFind::KeyPress(nsIDOMEvent* aEvent)
   if (((charCode == 'g' || charCode=='G') && isAlt + isMeta + isCtrl == 1 && (
       (nsTypeAheadFind::sAccelKey == nsIDOMKeyEvent::DOM_VK_CONTROL && isCtrl) ||
       (nsTypeAheadFind::sAccelKey == nsIDOMKeyEvent::DOM_VK_ALT     && isAlt ) ||
-      (nsTypeAheadFind::sAccelKey == nsIDOMKeyEvent::DOM_VK_META    && isMeta))) ||
+      (nsTypeAheadFind::sAccelKey == nsIDOMKeyEvent::DOM_VK_META    && isMeta)))
 #ifdef XP_MAC
      // We don't use F3 for find next on Macintosh, function keys are user
      // definable there
      ) {
 #else
-    (keyCode == nsIDOMKeyEvent::DOM_VK_F3 && !isCtrl && !isMeta && !isAlt)) {
+    || (keyCode == nsIDOMKeyEvent::DOM_VK_F3 && !isCtrl && !isMeta && !isAlt)) {
 #endif
     // We steal Accel+G, F3 (find next) and Accel+Shift+G, Shift+F3
     // (find prev), avoid early return, so we can use our find loop