diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 04:29:26 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 04:29:26 +0000 |
| commit | df2013932664ec3718248ed7c6f41445bb939a10 (patch) | |
| tree | 49c2eb838e9a7cff2e47ea3afef0c3c9d8dee406 /chrome/chrome.xcodeproj | |
| parent | 5a43a8d52d5c369beb16b52a8a32315a228f804b (diff) | |
| download | chromium_src-df2013932664ec3718248ed7c6f41445bb939a10.zip chromium_src-df2013932664ec3718248ed7c6f41445bb939a10.tar.gz chromium_src-df2013932664ec3718248ed7c6f41445bb939a10.tar.bz2 | |
Re-land r10564 with a fix for unit tests. Fixed a typo in an ifdef.
Make firefox_importer_utils.cc compile on Posix.
TBR=evan
Review URL: http://codereview.chromium.org/29006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.xcodeproj')
| -rw-r--r-- | chrome/chrome.xcodeproj/project.pbxproj | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index e1121d5..0d2f911 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -270,6 +270,7 @@ 71784BA931A610A94A7FEDC9 /* history_querying_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF9F50E9D48F7009A6919 /* history_querying_unittest.cc */; }; 7442556F908264C52BEBFE4D /* starred_url_database_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFA090E9D48F7009A6919 /* starred_url_database_unittest.cc */; }; 7988AD180F4E5C710003C5CF /* child_process_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = BA9BC2620F44DCBE00588450 /* child_process_info.cc */; }; + 7A25BF747B2F2CC2115A2818 /* firefox_importer_utils.cc in Sources */ = {isa = PBXBuildFile; fileRef = E7A3400C283C5FA030AD4BF2 /* firefox_importer_utils.cc */; }; 7D296C6300A94C463E1E7BC7 /* interstitial_page.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6CCB9D10F1EC32700106F0D /* interstitial_page.cc */; }; 7D7BF08CA9978F8782A1E82D /* browser_shutdown.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8460E9D4839009A6919 /* browser_shutdown.cc */; }; 7F84A3FF0F6102F46E0E5155 /* history_publisher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 269003C4E493789D82B6B0F9 /* history_publisher.cc */; }; @@ -2947,6 +2948,7 @@ E4F324420EE5CE94002533CE /* extension_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extension_unittest.cc; sourceTree = "<group>"; }; E4F324780EE5D17E002533CE /* referrer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = referrer.h; sourceTree = "<group>"; }; E4F324790EE5D17E002533CE /* referrer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = referrer.cc; sourceTree = "<group>"; }; + E7A3400C283C5FA030AD4BF2 /* firefox_importer_utils.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = firefox_importer_utils.cc; path = browser/importer/firefox_importer_utils.cc; sourceTree = SOURCE_ROOT; }; E7FDE61828F151056D975855 /* bookmark_drag_data.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bookmark_drag_data.cc; path = browser/bookmarks/bookmark_drag_data.cc; sourceTree = SOURCE_ROOT; }; E81681ADC802675FE949BC63 /* child_thread.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = child_thread.cc; sourceTree = "<group>"; }; EA72C084DB3FC0FC595E525E /* template_url_model.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = template_url_model.cc; sourceTree = "<group>"; }; @@ -3358,6 +3360,7 @@ 12F137DA942221A44BFA0967 /* bookmark_drop_info.cc */, 90BF0D1189BB7158BD7F1600 /* bookmark_context_menu.cc */, D224399513442348FF231FCB /* importer.cc */, + E7A3400C283C5FA030AD4BF2 /* firefox_importer_utils.cc */, ); sourceTree = "<group>"; }; @@ -5775,6 +5778,7 @@ 9E85B39CA40439D93CE52E60 /* fav_icon_helper.cc in Sources */, E45075C10F1506F2003BE099 /* firefox2_importer.cc in Sources */, E45075C40F150701003BE099 /* firefox3_importer.cc in Sources */, + 7A25BF747B2F2CC2115A2818 /* firefox_importer_utils.cc in Sources */, E45075C60F15070D003BE099 /* firefox_profile_lock.cc in Sources */, 85C8A66BBC97243AF1C11166 /* gears_integration.cc in Sources */, 4D7BF9990E9D486B009A6919 /* google_url_tracker.cc in Sources */, |