diff --git a/mozilla/camino/CHAutoCompleteDataSource.h b/mozilla/camino/CHAutoCompleteDataSource.h
new file mode 100644
index 00000000000..15a30e1f6bb
--- /dev/null
+++ b/mozilla/camino/CHAutoCompleteDataSource.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import <Foundation/Foundation.h>
+
+@interface CHAutoCompleteDataSource : NSObject {
+
+}
+
+@end
diff --git a/mozilla/camino/CHAutoCompleteDataSource.mm b/mozilla/camino/CHAutoCompleteDataSource.mm
new file mode 100644
index 00000000000..03c8f7b8096
--- /dev/null
+++ b/mozilla/camino/CHAutoCompleteDataSource.mm
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import "CHAutoCompleteDataSource.h"
+
+@implementation CHAutoCompleteDataSource
+
+@end
diff --git a/mozilla/camino/CHAutoCompleteTableView.h b/mozilla/camino/CHAutoCompleteTableView.h
new file mode 100644
index 00000000000..4a2bbf21154
--- /dev/null
+++ b/mozilla/camino/CHAutoCompleteTableView.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import <AppKit/AppKit.h>
+
+@interface CHAutoCompleteTableView : NSTableView {
+
+}
+
+@end
diff --git a/mozilla/camino/CHAutoCompleteTableView.mm b/mozilla/camino/CHAutoCompleteTableView.mm
new file mode 100644
index 00000000000..44a48dbbda4
--- /dev/null
+++ b/mozilla/camino/CHAutoCompleteTableView.mm
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import "CHAutoCompleteTableView.h"
+
+@implementation CHAutoCompleteTableView
+
+@end
diff --git a/mozilla/camino/Chimera.pbproj/project.pbxproj b/mozilla/camino/Chimera.pbproj/project.pbxproj
index 41a68da809d..2bf9ce135a7 100644
--- a/mozilla/camino/Chimera.pbproj/project.pbxproj
+++ b/mozilla/camino/Chimera.pbproj/project.pbxproj
@@ -22,6 +22,8 @@
 				F57074BE026D80DF01A80166,
 				F59E9F3F0237E43401A967DF,
 				F52D5CCC027A867601A80166,
+				F52D5CD0027A887001A80166,
+				F52D5CD4027A88C601A80166,
 			);
 			isa = PBXGroup;
 			name = Classes;
@@ -393,6 +395,8 @@
 				F541495C02711A8301A80166,
 				F541496002711B0101A80166,
 				F52D5CCD027A867601A80166,
+				F52D5CD1027A887001A80166,
+				F52D5CD5027A88C601A80166,
 			);
 			isa = PBXHeadersBuildPhase;
 			name = Headers;
@@ -483,6 +487,8 @@
 				F541495D02711A8301A80166,
 				F541496102711B0101A80166,
 				F52D5CCE027A867601A80166,
+				F52D5CD2027A887001A80166,
+				F52D5CD6027A88C601A80166,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -882,6 +888,8 @@
 				F59E9F3D0237E28401A967DF,
 				F5137A1102676B9101026D05,
 				F52D5CCB027A867601A80166,
+				F52D5CCF027A887001A80166,
+				F52D5CD3027A88C601A80166,
 			);
 			isa = PBXGroup;
 			name = Headers;
@@ -1388,6 +1396,50 @@
 			settings = {
 			};
 		};
+		F52D5CCF027A887001A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteTableView.h;
+			refType = 4;
+		};
+		F52D5CD0027A887001A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteTableView.mm;
+			refType = 4;
+		};
+		F52D5CD1027A887001A80166 = {
+			fileRef = F52D5CCF027A887001A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD2027A887001A80166 = {
+			fileRef = F52D5CD0027A887001A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD3027A88C601A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteDataSource.h;
+			refType = 4;
+		};
+		F52D5CD4027A88C601A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteDataSource.mm;
+			refType = 4;
+		};
+		F52D5CD5027A88C601A80166 = {
+			fileRef = F52D5CD3027A88C601A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD6027A88C601A80166 = {
+			fileRef = F52D5CD4027A88C601A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F538DFAE023B36A7010001CA = {
 			children = (
 				F538DFAF023B3739010001CA,
diff --git a/mozilla/camino/projects/Chimera.pbproj/project.pbxproj b/mozilla/camino/projects/Chimera.pbproj/project.pbxproj
index 41a68da809d..2bf9ce135a7 100644
--- a/mozilla/camino/projects/Chimera.pbproj/project.pbxproj
+++ b/mozilla/camino/projects/Chimera.pbproj/project.pbxproj
@@ -22,6 +22,8 @@
 				F57074BE026D80DF01A80166,
 				F59E9F3F0237E43401A967DF,
 				F52D5CCC027A867601A80166,
+				F52D5CD0027A887001A80166,
+				F52D5CD4027A88C601A80166,
 			);
 			isa = PBXGroup;
 			name = Classes;
@@ -393,6 +395,8 @@
 				F541495C02711A8301A80166,
 				F541496002711B0101A80166,
 				F52D5CCD027A867601A80166,
+				F52D5CD1027A887001A80166,
+				F52D5CD5027A88C601A80166,
 			);
 			isa = PBXHeadersBuildPhase;
 			name = Headers;
@@ -483,6 +487,8 @@
 				F541495D02711A8301A80166,
 				F541496102711B0101A80166,
 				F52D5CCE027A867601A80166,
+				F52D5CD2027A887001A80166,
+				F52D5CD6027A88C601A80166,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -882,6 +888,8 @@
 				F59E9F3D0237E28401A967DF,
 				F5137A1102676B9101026D05,
 				F52D5CCB027A867601A80166,
+				F52D5CCF027A887001A80166,
+				F52D5CD3027A88C601A80166,
 			);
 			isa = PBXGroup;
 			name = Headers;
@@ -1388,6 +1396,50 @@
 			settings = {
 			};
 		};
+		F52D5CCF027A887001A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteTableView.h;
+			refType = 4;
+		};
+		F52D5CD0027A887001A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteTableView.mm;
+			refType = 4;
+		};
+		F52D5CD1027A887001A80166 = {
+			fileRef = F52D5CCF027A887001A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD2027A887001A80166 = {
+			fileRef = F52D5CD0027A887001A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD3027A88C601A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteDataSource.h;
+			refType = 4;
+		};
+		F52D5CD4027A88C601A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteDataSource.mm;
+			refType = 4;
+		};
+		F52D5CD5027A88C601A80166 = {
+			fileRef = F52D5CD3027A88C601A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD6027A88C601A80166 = {
+			fileRef = F52D5CD4027A88C601A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F538DFAE023B36A7010001CA = {
 			children = (
 				F538DFAF023B3739010001CA,
diff --git a/mozilla/camino/src/browser/AutoCompleteDataSource.h b/mozilla/camino/src/browser/AutoCompleteDataSource.h
new file mode 100644
index 00000000000..15a30e1f6bb
--- /dev/null
+++ b/mozilla/camino/src/browser/AutoCompleteDataSource.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import <Foundation/Foundation.h>
+
+@interface CHAutoCompleteDataSource : NSObject {
+
+}
+
+@end
diff --git a/mozilla/camino/src/browser/AutoCompleteDataSource.mm b/mozilla/camino/src/browser/AutoCompleteDataSource.mm
new file mode 100644
index 00000000000..03c8f7b8096
--- /dev/null
+++ b/mozilla/camino/src/browser/AutoCompleteDataSource.mm
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import "CHAutoCompleteDataSource.h"
+
+@implementation CHAutoCompleteDataSource
+
+@end
diff --git a/mozilla/chimera/CHAutoCompleteDataSource.h b/mozilla/chimera/CHAutoCompleteDataSource.h
new file mode 100644
index 00000000000..15a30e1f6bb
--- /dev/null
+++ b/mozilla/chimera/CHAutoCompleteDataSource.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import <Foundation/Foundation.h>
+
+@interface CHAutoCompleteDataSource : NSObject {
+
+}
+
+@end
diff --git a/mozilla/chimera/CHAutoCompleteDataSource.mm b/mozilla/chimera/CHAutoCompleteDataSource.mm
new file mode 100644
index 00000000000..03c8f7b8096
--- /dev/null
+++ b/mozilla/chimera/CHAutoCompleteDataSource.mm
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import "CHAutoCompleteDataSource.h"
+
+@implementation CHAutoCompleteDataSource
+
+@end
diff --git a/mozilla/chimera/CHAutoCompleteTableView.h b/mozilla/chimera/CHAutoCompleteTableView.h
new file mode 100644
index 00000000000..4a2bbf21154
--- /dev/null
+++ b/mozilla/chimera/CHAutoCompleteTableView.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import <AppKit/AppKit.h>
+
+@interface CHAutoCompleteTableView : NSTableView {
+
+}
+
+@end
diff --git a/mozilla/chimera/CHAutoCompleteTableView.mm b/mozilla/chimera/CHAutoCompleteTableView.mm
new file mode 100644
index 00000000000..44a48dbbda4
--- /dev/null
+++ b/mozilla/chimera/CHAutoCompleteTableView.mm
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import "CHAutoCompleteTableView.h"
+
+@implementation CHAutoCompleteTableView
+
+@end
diff --git a/mozilla/chimera/Chimera.pbproj/project.pbxproj b/mozilla/chimera/Chimera.pbproj/project.pbxproj
index 41a68da809d..2bf9ce135a7 100644
--- a/mozilla/chimera/Chimera.pbproj/project.pbxproj
+++ b/mozilla/chimera/Chimera.pbproj/project.pbxproj
@@ -22,6 +22,8 @@
 				F57074BE026D80DF01A80166,
 				F59E9F3F0237E43401A967DF,
 				F52D5CCC027A867601A80166,
+				F52D5CD0027A887001A80166,
+				F52D5CD4027A88C601A80166,
 			);
 			isa = PBXGroup;
 			name = Classes;
@@ -393,6 +395,8 @@
 				F541495C02711A8301A80166,
 				F541496002711B0101A80166,
 				F52D5CCD027A867601A80166,
+				F52D5CD1027A887001A80166,
+				F52D5CD5027A88C601A80166,
 			);
 			isa = PBXHeadersBuildPhase;
 			name = Headers;
@@ -483,6 +487,8 @@
 				F541495D02711A8301A80166,
 				F541496102711B0101A80166,
 				F52D5CCE027A867601A80166,
+				F52D5CD2027A887001A80166,
+				F52D5CD6027A88C601A80166,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -882,6 +888,8 @@
 				F59E9F3D0237E28401A967DF,
 				F5137A1102676B9101026D05,
 				F52D5CCB027A867601A80166,
+				F52D5CCF027A887001A80166,
+				F52D5CD3027A88C601A80166,
 			);
 			isa = PBXGroup;
 			name = Headers;
@@ -1388,6 +1396,50 @@
 			settings = {
 			};
 		};
+		F52D5CCF027A887001A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteTableView.h;
+			refType = 4;
+		};
+		F52D5CD0027A887001A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteTableView.mm;
+			refType = 4;
+		};
+		F52D5CD1027A887001A80166 = {
+			fileRef = F52D5CCF027A887001A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD2027A887001A80166 = {
+			fileRef = F52D5CD0027A887001A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD3027A88C601A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteDataSource.h;
+			refType = 4;
+		};
+		F52D5CD4027A88C601A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteDataSource.mm;
+			refType = 4;
+		};
+		F52D5CD5027A88C601A80166 = {
+			fileRef = F52D5CD3027A88C601A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD6027A88C601A80166 = {
+			fileRef = F52D5CD4027A88C601A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F538DFAE023B36A7010001CA = {
 			children = (
 				F538DFAF023B3739010001CA,
diff --git a/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj b/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj
index 41a68da809d..2bf9ce135a7 100644
--- a/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj
+++ b/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj
@@ -22,6 +22,8 @@
 				F57074BE026D80DF01A80166,
 				F59E9F3F0237E43401A967DF,
 				F52D5CCC027A867601A80166,
+				F52D5CD0027A887001A80166,
+				F52D5CD4027A88C601A80166,
 			);
 			isa = PBXGroup;
 			name = Classes;
@@ -393,6 +395,8 @@
 				F541495C02711A8301A80166,
 				F541496002711B0101A80166,
 				F52D5CCD027A867601A80166,
+				F52D5CD1027A887001A80166,
+				F52D5CD5027A88C601A80166,
 			);
 			isa = PBXHeadersBuildPhase;
 			name = Headers;
@@ -483,6 +487,8 @@
 				F541495D02711A8301A80166,
 				F541496102711B0101A80166,
 				F52D5CCE027A867601A80166,
+				F52D5CD2027A887001A80166,
+				F52D5CD6027A88C601A80166,
 			);
 			isa = PBXSourcesBuildPhase;
 			name = Sources;
@@ -882,6 +888,8 @@
 				F59E9F3D0237E28401A967DF,
 				F5137A1102676B9101026D05,
 				F52D5CCB027A867601A80166,
+				F52D5CCF027A887001A80166,
+				F52D5CD3027A88C601A80166,
 			);
 			isa = PBXGroup;
 			name = Headers;
@@ -1388,6 +1396,50 @@
 			settings = {
 			};
 		};
+		F52D5CCF027A887001A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteTableView.h;
+			refType = 4;
+		};
+		F52D5CD0027A887001A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteTableView.mm;
+			refType = 4;
+		};
+		F52D5CD1027A887001A80166 = {
+			fileRef = F52D5CCF027A887001A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD2027A887001A80166 = {
+			fileRef = F52D5CD0027A887001A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD3027A88C601A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteDataSource.h;
+			refType = 4;
+		};
+		F52D5CD4027A88C601A80166 = {
+			isa = PBXFileReference;
+			path = CHAutoCompleteDataSource.mm;
+			refType = 4;
+		};
+		F52D5CD5027A88C601A80166 = {
+			fileRef = F52D5CD3027A88C601A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F52D5CD6027A88C601A80166 = {
+			fileRef = F52D5CD4027A88C601A80166;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		F538DFAE023B36A7010001CA = {
 			children = (
 				F538DFAF023B3739010001CA,
diff --git a/mozilla/chimera/src/browser/AutoCompleteDataSource.h b/mozilla/chimera/src/browser/AutoCompleteDataSource.h
new file mode 100644
index 00000000000..15a30e1f6bb
--- /dev/null
+++ b/mozilla/chimera/src/browser/AutoCompleteDataSource.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import <Foundation/Foundation.h>
+
+@interface CHAutoCompleteDataSource : NSObject {
+
+}
+
+@end
diff --git a/mozilla/chimera/src/browser/AutoCompleteDataSource.mm b/mozilla/chimera/src/browser/AutoCompleteDataSource.mm
new file mode 100644
index 00000000000..03c8f7b8096
--- /dev/null
+++ b/mozilla/chimera/src/browser/AutoCompleteDataSource.mm
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+*
+* The contents of this file are subject to the Mozilla Public
+* License Version 1.1 (the "License"); you may not use this file
+* except in compliance with the License. You may obtain a copy of
+* the License at http://www.mozilla.org/MPL/
+*
+* Software distributed under the License is distributed on an "AS
+* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+* implied. See the License for the specific language governing
+* rights and limitations under the License.
+*
+* The Original Code is the Mozilla browser.
+*
+* The Initial Developer of the Original Code is Netscape
+* Communications Corporation. Portions created by Netscape are
+* Copyright (C) 2002 Netscape Communications Corporation. All
+* Rights Reserved.
+*
+* Contributor(s):
+*   David Hyatt <hyatt@netscape.com> (Original Author)
+*/
+
+#import "CHAutoCompleteDataSource.h"
+
+@implementation CHAutoCompleteDataSource
+
+@end