Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(532)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: base/base.xcodeproj/project.pbxproj

Issue 9342: Turn time_mac.cc back on, with workaround for scoped_cftyperef reset bug (Closed) Base URL: svn://localhost/chrome/trunk/src/
Patch Set: Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | base/time_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // !$*UTF8*$! 1 // !$*UTF8*$!
2 { 2 {
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 objectVersion = 45; 6 objectVersion = 45;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXAggregateTarget section */ 9 /* Begin PBXAggregateTarget section */
10 825404020D92D3340006B936 /* All */ = { 10 825404020D92D3340006B936 /* All */ = {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 93611B1A0E5A878400F9405D /* histogram_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93611B190E5A878400F9405D /* histogram_unittest. cc */; }; 140 93611B1A0E5A878400F9405D /* histogram_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93611B190E5A878400F9405D /* histogram_unittest. cc */; };
141 93E703170E5D63E00046259B /* platform_thread_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93E703160E5D63E00046259B /* platform_thread_ posix.cc */; }; 141 93E703170E5D63E00046259B /* platform_thread_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93E703160E5D63E00046259B /* platform_thread_ posix.cc */; };
142 93E7031B0E5D64390046259B /* thread_unittest.cc in Sources */ = { isa = PBXBuildFile; fileRef = 93E7031A0E5D64390046259B /* thread_unittest.cc */; }; 142 93E7031B0E5D64390046259B /* thread_unittest.cc in Sources */ = { isa = PBXBuildFile; fileRef = 93E7031A0E5D64390046259B /* thread_unittest.cc */; };
143 93E703240E5D64F00046259B /* thread.cc in Sources */ = {isa = PBX BuildFile; fileRef = 93E703230E5D64F00046259B /* thread.cc */; }; 143 93E703240E5D64F00046259B /* thread.cc in Sources */ = {isa = PBX BuildFile; fileRef = 93E703230E5D64F00046259B /* thread.cc */; };
144 A573F5D90EBB78260055A84A /* platform_file_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = A573F5D80EBB78260055A84A /* platform_file_posi x.cc */; }; 144 A573F5D90EBB78260055A84A /* platform_file_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = A573F5D80EBB78260055A84A /* platform_file_posi x.cc */; };
145 A5A026550E4A214600498DA9 /* file_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = A5A026540E4A214600498DA9 /* file_util.cc */; }; 145 A5A026550E4A214600498DA9 /* file_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = A5A026540E4A214600498DA9 /* file_util.cc */; };
146 A5A0268E0E4A2BDC00498DA9 /* file_util_posix.cc in Sources */ = { isa = PBXBuildFile; fileRef = A5A0268D0E4A2BDC00498DA9 /* file_util_posix.cc */; }; 146 A5A0268E0E4A2BDC00498DA9 /* file_util_posix.cc in Sources */ = { isa = PBXBuildFile; fileRef = A5A0268D0E4A2BDC00498DA9 /* file_util_posix.cc */; };
147 A5A0270B0E4A630D00498DA9 /* file_util_mac.mm in Sources */ = {is a = PBXBuildFile; fileRef = A5A0270A0E4A630D00498DA9 /* file_util_mac.mm */; }; 147 A5A0270B0E4A630D00498DA9 /* file_util_mac.mm in Sources */ = {is a = PBXBuildFile; fileRef = A5A0270A0E4A630D00498DA9 /* file_util_mac.mm */; };
148 A5CB82980E5C74E300FD6825 /* platform_test_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5CB82970E5C74E300FD6825 /* platform_test_mac.mm */; }; 148 A5CB82980E5C74E300FD6825 /* platform_test_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A5CB82970E5C74E300FD6825 /* platform_test_mac.mm */; };
149 A5CE1D2B0E55F4D800AD0606 /* file_util_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = A5A0282D0E4CFA8500498DA9 /* file_util_unittest. cc */; }; 149 A5CE1D2B0E55F4D800AD0606 /* file_util_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = A5A0282D0E4CFA8500498DA9 /* file_util_unittest. cc */; };
150 » » AB14B6070EBFA74C00FB3807 /* time_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB14B6060EBFA74C00FB3807 /* time_posix.cc */; }; 150 » » AB4C147D0EC0E3F600655FED /* time_mac.cc in Sources */ = {isa = P BXBuildFile; fileRef = 7BEB81490D9B0F33009BA8DD /* time_mac.cc */; };
151 AB956DFD0E5DDB5D00BBE9D8 /* platform_canvas_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 829E2F990DBFD76300819EBF /* platform_canvas_ma c.cc */; }; 151 AB956DFD0E5DDB5D00BBE9D8 /* platform_canvas_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 829E2F990DBFD76300819EBF /* platform_canvas_ma c.cc */; };
152 AB956DFE0E5DDB6000BBE9D8 /* platform_device_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 829E2F9D0DBFD76F00819EBF /* platform_device_ma c.cc */; }; 152 AB956DFE0E5DDB6000BBE9D8 /* platform_device_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 829E2F9D0DBFD76F00819EBF /* platform_device_ma c.cc */; };
153 AB956DFF0E5DDB6900BBE9D8 /* bitmap_platform_device_mac.cc in Sou rces */ = {isa = PBXBuildFile; fileRef = 829E2F940DBFD74B00819EBF /* bitmap_plat form_device_mac.cc */; }; 153 AB956DFF0E5DDB6900BBE9D8 /* bitmap_platform_device_mac.cc in Sou rces */ = {isa = PBXBuildFile; fileRef = 829E2F940DBFD74B00819EBF /* bitmap_plat form_device_mac.cc */; };
154 AB956E030E5DDB7A00BBE9D8 /* image_operations.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48A06370E3F6C1F00172919 /* image_operations.cc * /; }; 154 AB956E030E5DDB7A00BBE9D8 /* image_operations.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48A06370E3F6C1F00172919 /* image_operations.cc * /; };
155 AB956E0A0E5DDC0900BBE9D8 /* image_operations_unittest.cc in Sour ces */ = {isa = PBXBuildFile; fileRef = E48A063B0E3F6C3000172919 /* image_operat ions_unittest.cc */; }; 155 AB956E0A0E5DDC0900BBE9D8 /* image_operations_unittest.cc in Sour ces */ = {isa = PBXBuildFile; fileRef = E48A063B0E3F6C3000172919 /* image_operat ions_unittest.cc */; };
156 ABE1BA2A0E7574D1009041DA /* ApplicationServices.framework in Fra meworks */ = {isa = PBXBuildFile; fileRef = ABE1BA290E7574D1009041DA /* Applicat ionServices.framework */; }; 156 ABE1BA2A0E7574D1009041DA /* ApplicationServices.framework in Fra meworks */ = {isa = PBXBuildFile; fileRef = ABE1BA290E7574D1009041DA /* Applicat ionServices.framework */; };
157 ABE1BA610E75757C009041DA /* skia_utils_mac.cc in Sources */ = {i sa = PBXBuildFile; fileRef = ABE1BA600E75757C009041DA /* skia_utils_mac.cc */; } ; 157 ABE1BA610E75757C009041DA /* skia_utils_mac.cc in Sources */ = {i sa = PBXBuildFile; fileRef = ABE1BA600E75757C009041DA /* skia_utils_mac.cc */; } ;
158 ABF4B98F0DC2BA6900A6E319 /* base_paths_mac.mm in Sources */ = {i sa = PBXBuildFile; fileRef = ABF4B98E0DC2BA6900A6E319 /* base_paths_mac.mm */; } ; 158 ABF4B98F0DC2BA6900A6E319 /* base_paths_mac.mm in Sources */ = {i sa = PBXBuildFile; fileRef = ABF4B98E0DC2BA6900A6E319 /* base_paths_mac.mm */; } ;
159 ABF4B99E0DC2BB6000A6E319 /* clipboard_mac.mm in Sources */ = {is a = PBXBuildFile; fileRef = ABF4B99D0DC2BB6000A6E319 /* clipboard_mac.mm */; }; 159 ABF4B99E0DC2BB6000A6E319 /* clipboard_mac.mm in Sources */ = {is a = PBXBuildFile; fileRef = ABF4B99D0DC2BB6000A6E319 /* clipboard_mac.mm */; };
160 ABF4B9AF0DC2BC6200A6E319 /* json_reader.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8254031B0D92D1F40006B936 /* json_reader.cc */; }; 160 ABF4B9AF0DC2BC6200A6E319 /* json_reader.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8254031B0D92D1F40006B936 /* json_reader.cc */; };
(...skipping 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after
1381 829E35D50DC0DC9400819EBF /* logging.cc in Source s */, 1381 829E35D50DC0DC9400819EBF /* logging.cc in Source s */,
1382 ABFBD3E60DC793C600E164CB /* md5.cc in Sources */ , 1382 ABFBD3E60DC793C600E164CB /* md5.cc in Sources */ ,
1383 ABF4B9B20DC2BC8300A6E319 /* memory_debug.cc in S ources */, 1383 ABF4B9B20DC2BC8300A6E319 /* memory_debug.cc in S ources */,
1384 93611AE10E5A7FE200F9405D /* message_loop.cc in S ources */, 1384 93611AE10E5A7FE200F9405D /* message_loop.cc in S ources */,
1385 93611ADF0E5A7FC500F9405D /* message_pump_default .cc in Sources */, 1385 93611ADF0E5A7FC500F9405D /* message_pump_default .cc in Sources */,
1386 7B26302F0E82F218001CE27F /* message_pump_libeven t.cc in Sources */, 1386 7B26302F0E82F218001CE27F /* message_pump_libeven t.cc in Sources */,
1387 7BA355EB0E898C100023C8B9 /* message_pump_mac.mm in Sources */, 1387 7BA355EB0E898C100023C8B9 /* message_pump_mac.mm in Sources */,
1388 7BF882910E719389000BAF8A /* non_thread_safe.cc i n Sources */, 1388 7BF882910E719389000BAF8A /* non_thread_safe.cc i n Sources */,
1389 ABF4B9B50DC2BC9F00A6E319 /* path_service.cc in S ources */, 1389 ABF4B9B50DC2BC9F00A6E319 /* path_service.cc in S ources */,
1390 824654A60DC25CD7007C2BAA /* pickle.cc in Sources */, 1390 824654A60DC25CD7007C2BAA /* pickle.cc in Sources */,
1391 A573F5D90EBB78260055A84A /* platform_file_posix. cc in Sources */,
1391 7BF164F30E660CA500AA999E /* platform_thread_mac. mm in Sources */, 1392 7BF164F30E660CA500AA999E /* platform_thread_mac. mm in Sources */,
1392 93E703170E5D63E00046259B /* platform_thread_posi x.cc in Sources */, 1393 93E703170E5D63E00046259B /* platform_thread_posi x.cc in Sources */,
1393 7BD8F4A10E65AA4600034DE9 /* process_util_posix.c c in Sources */, 1394 7BD8F4A10E65AA4600034DE9 /* process_util_posix.c c in Sources */,
1394 824654DF0DC26521007C2BAA /* prtime.cc in Sources */, 1395 824654DF0DC26521007C2BAA /* prtime.cc in Sources */,
1395 4D11B59A0E91730200EF7617 /* rand_util.cc in Sour ces */, 1396 4D11B59A0E91730200EF7617 /* rand_util.cc in Sour ces */,
1396 4D11B59B0E91730200EF7617 /* rand_util_posix.cc i n Sources */, 1397 4D11B59B0E91730200EF7617 /* rand_util_posix.cc i n Sources */,
1397 7B836C050E55BBB800F6AD31 /* ref_counted.cc in So urces */, 1398 7B836C050E55BBB800F6AD31 /* ref_counted.cc in So urces */,
1398 8246548C0DC259DB007C2BAA /* revocable_store.cc i n Sources */, 1399 8246548C0DC259DB007C2BAA /* revocable_store.cc i n Sources */,
1399 7BA35DD30E8C0D5F0023C8B9 /* scoped_nsautorelease _pool.mm in Sources */, 1400 7BA35DD30E8C0D5F0023C8B9 /* scoped_nsautorelease _pool.mm in Sources */,
1400 ABF4B9BC0DC2BD1000A6E319 /* sha2.cc in Sources * /, 1401 ABF4B9BC0DC2BD1000A6E319 /* sha2.cc in Sources * /,
1401 ABF4B9BE0DC2BD1500A6E319 /* sha512.cc in Sources */, 1402 ABF4B9BE0DC2BD1500A6E319 /* sha512.cc in Sources */,
1402 824653740DC12D0E007C2BAA /* shared_memory_posix. cc in Sources */, 1403 824653740DC12D0E007C2BAA /* shared_memory_posix. cc in Sources */,
1403 7BAE30E70E6D93A300C3F750 /* simple_thread.cc in Sources */, 1404 7BAE30E70E6D93A300C3F750 /* simple_thread.cc in Sources */,
1404 829E365F0DC0FB1C00819EBF /* stats_table.cc in So urces */, 1405 829E365F0DC0FB1C00819EBF /* stats_table.cc in So urces */,
1405 7BD8F7740E65E89800034DE9 /* string16.cc in Sourc es */, 1406 7BD8F7740E65E89800034DE9 /* string16.cc in Sourc es */,
1406 E4A133440E37A3C400110AA2 /* string_escape.cc in Sources */, 1407 E4A133440E37A3C400110AA2 /* string_escape.cc in Sources */,
1407 820EB4F70E3A613F009668FC /* string_piece.cc in S ources */, 1408 820EB4F70E3A613F009668FC /* string_piece.cc in S ources */,
1408 829E36460DC0F6AC00819EBF /* string_util.cc in So urces */, 1409 829E36460DC0F6AC00819EBF /* string_util.cc in So urces */,
1409 820EB4FA0E3A6178009668FC /* string_util_icu.cc i n Sources */, 1410 820EB4FA0E3A6178009668FC /* string_util_icu.cc i n Sources */,
1410 7B6AF6340E80211C00F9F9CF /* sys_info_posix.cc in Sources */, 1411 7B6AF6340E80211C00F9F9CF /* sys_info_posix.cc in Sources */,
1411 7B4C5F4A0E4B6BF900679E8F /* sys_string_conversio ns_mac.mm in Sources */, 1412 7B4C5F4A0E4B6BF900679E8F /* sys_string_conversio ns_mac.mm in Sources */,
1412 E4CE9D7A0E8C1FD400D5378C /* system_monitor.cc in Sources */, 1413 E4CE9D7A0E8C1FD400D5378C /* system_monitor.cc in Sources */,
1413 93E703240E5D64F00046259B /* thread.cc in Sources */, 1414 93E703240E5D64F00046259B /* thread.cc in Sources */,
1414 7BAE38AC0E6EFDBA00C3F750 /* thread_local_posix.c c in Sources */, 1415 7BAE38AC0E6EFDBA00C3F750 /* thread_local_posix.c c in Sources */,
1415 829E36730DC0FBAD00819EBF /* thread_local_storage _posix.cc in Sources */, 1416 829E36730DC0FBAD00819EBF /* thread_local_storage _posix.cc in Sources */,
1416 824654910DC25A8C007C2BAA /* time.cc in Sources * /, 1417 824654910DC25A8C007C2BAA /* time.cc in Sources * /,
1417 82D094550E5B892600FEC05C /* time_format.cc in So urces */, 1418 82D094550E5B892600FEC05C /* time_format.cc in So urces */,
1419 AB4C147D0EC0E3F600655FED /* time_mac.cc in Sourc es */,
1418 E49357220E422A36008F8B09 /* timer.cc in Sources */, 1420 E49357220E422A36008F8B09 /* timer.cc in Sources */,
1419 7BF882800E71929B000BAF8A /* trace_event.cc in So urces */, 1421 7BF882800E71929B000BAF8A /* trace_event.cc in So urces */,
1420 820EB5020E3A618B009668FC /* tracked.cc in Source s */, 1422 820EB5020E3A618B009668FC /* tracked.cc in Source s */,
1421 820EB5480E3A64D2009668FC /* tracked_objects.cc i n Sources */, 1423 820EB5480E3A64D2009668FC /* tracked_objects.cc i n Sources */,
1422 ABF4B9C30DC2BD6C00A6E319 /* values.cc in Sources */, 1424 ABF4B9C30DC2BD6C00A6E319 /* values.cc in Sources */,
1423 9301C03B0E54C839001EF103 /* waitable_event_gener ic.cc in Sources */, 1425 9301C03B0E54C839001EF103 /* waitable_event_gener ic.cc in Sources */,
1424 824655DD0DC659B8007C2BAA /* word_iterator.cc in Sources */, 1426 824655DD0DC659B8007C2BAA /* word_iterator.cc in Sources */,
1425 7BF1658D0E663B4800AA999E /* worker_pool_mac.mm i n Sources */, 1427 7BF1658D0E663B4800AA999E /* worker_pool_mac.mm i n Sources */,
1426 A573F5D90EBB78260055A84A /* platform_file_posix. cc in Sources */,
1427 AB14B6070EBFA74C00FB3807 /* time_posix.cc in Sou rces */,
1428 ); 1428 );
1429 runOnlyForDeploymentPostprocessing = 0; 1429 runOnlyForDeploymentPostprocessing = 0;
1430 }; 1430 };
1431 825403AE0D92D2E50006B936 /* Sources */ = { 1431 825403AE0D92D2E50006B936 /* Sources */ = {
1432 isa = PBXSourcesBuildPhase; 1432 isa = PBXSourcesBuildPhase;
1433 buildActionMask = 2147483647; 1433 buildActionMask = 2147483647;
1434 files = ( 1434 files = (
1435 AB956DFF0E5DDB6900BBE9D8 /* bitmap_platform_devi ce_mac.cc in Sources */, 1435 AB956DFF0E5DDB6900BBE9D8 /* bitmap_platform_devi ce_mac.cc in Sources */,
1436 E48A06710E3F70E200172919 /* convolver.cc in Sour ces */, 1436 E48A06710E3F70E200172919 /* convolver.cc in Sour ces */,
1437 AB956E030E5DDB7A00BBE9D8 /* image_operations.cc in Sources */, 1437 AB956E030E5DDB7A00BBE9D8 /* image_operations.cc in Sources */,
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1778 E49F1A880E4CDB4500386AEC /* Debug */, 1778 E49F1A880E4CDB4500386AEC /* Debug */,
1779 E49F1A890E4CDB4500386AEC /* Release */, 1779 E49F1A890E4CDB4500386AEC /* Release */,
1780 ); 1780 );
1781 defaultConfigurationIsVisible = 0; 1781 defaultConfigurationIsVisible = 0;
1782 defaultConfigurationName = Release; 1782 defaultConfigurationName = Release;
1783 }; 1783 };
1784 /* End XCConfigurationList section */ 1784 /* End XCConfigurationList section */
1785 }; 1785 };
1786 rootObject = 825402AA0D92D0C60006B936 /* Project object */; 1786 rootObject = 825402AA0D92D0C60006B936 /* Project object */;
1787 } 1787 }
OLDNEW
« no previous file with comments | « no previous file | base/time_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698