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

Side by Side Diff: testing/iossim/iossim.mm

Issue 1070753004: Bump iossim default device to 'iPhone 5s'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Foundation/Foundation.h> 5 #import <Foundation/Foundation.h>
6 #include <asl.h> 6 #include <asl.h>
7 #include <libgen.h> 7 #include <libgen.h>
8 #include <stdarg.h> 8 #include <stdarg.h>
9 #include <stdio.h> 9 #include <stdio.h>
10 10
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 toolName = strdup(toolName); 843 toolName = strdup(toolName);
844 if (toolName != NULL) 844 if (toolName != NULL)
845 gToolName = toolName; 845 gToolName = toolName;
846 } 846 }
847 if (worker != NULL) 847 if (worker != NULL)
848 free(worker); 848 free(worker);
849 849
850 NSString* appPath = nil; 850 NSString* appPath = nil;
851 NSString* appName = nil; 851 NSString* appName = nil;
852 NSString* sdkVersion = nil; 852 NSString* sdkVersion = nil;
853 NSString* deviceName = IsRunningWithXcode6OrLater() ? @"iPhone 5" : @"iPhone"; 853 NSString* deviceName =
854 IsRunningWithXcode6OrLater() ? @"iPhone 5s" : @"iPhone";
854 NSString* simHomePath = nil; 855 NSString* simHomePath = nil;
855 NSMutableArray* appArgs = [NSMutableArray array]; 856 NSMutableArray* appArgs = [NSMutableArray array];
856 NSMutableDictionary* appEnv = [NSMutableDictionary dictionary]; 857 NSMutableDictionary* appEnv = [NSMutableDictionary dictionary];
857 NSTimeInterval sessionStartTimeout = kDefaultSessionStartTimeoutSeconds; 858 NSTimeInterval sessionStartTimeout = kDefaultSessionStartTimeoutSeconds;
858 859
859 NSString* developerDir = FindDeveloperDir(); 860 NSString* developerDir = FindDeveloperDir();
860 if (!developerDir) { 861 if (!developerDir) {
861 LogError(@"Unable to find developer directory."); 862 LogError(@"Unable to find developer directory.");
862 exit(kExitInitializationFailure); 863 exit(kExitInitializationFailure);
863 } 864 }
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 [error localizedDescription], 1022 [error localizedDescription],
1022 [error domain], static_cast<long int>([error code])); 1023 [error domain], static_cast<long int>([error code]));
1023 } 1024 }
1024 1025
1025 // Note that this code is only executed if the simulator fails to start 1026 // Note that this code is only executed if the simulator fails to start
1026 // because once the main run loop is started, only the delegate calling 1027 // because once the main run loop is started, only the delegate calling
1027 // exit() will end the program. 1028 // exit() will end the program.
1028 [pool drain]; 1029 [pool drain];
1029 return kExitFailure; 1030 return kExitFailure;
1030 } 1031 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698