mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

clang-format objc files (#12673)

Browse source
This commit is contained in:
Shelley Vohr 2018-04-20 14:47:04 -04:00 • committed by Charles Kerr
parent 94236bf4eb
commit 12a57ff1c2
54 changed files with 1298 additions and 1033 deletions
Download patch file Download diff file Expand all files Collapse all files

3
brightray/common/application_info_mac.mm
View file

@ -9,7 +9,8 @@ namespace brightray {
namespace {
std::string ApplicationInfoDictionaryValue(NSString* key) {
return base::SysNSStringToUTF8([MainApplicationBundle().infoDictionary objectForKey:key]);
return base::SysNSStringToUTF8(
[MainApplicationBundle().infoDictionary objectForKey:key]);
}
std::string ApplicationInfoDictionaryValue(CFStringRef key) {

6
brightray/common/mac/main_application_bundle.mm
View file

@ -17,7 +17,8 @@ namespace {
bool HasMainProcessKey() {
NSDictionary* info_dictionary = [base::mac::MainBundle() infoDictionary];
return [[info_dictionary objectForKey:@"ElectronMainProcess"] boolValue] != NO;
return
[[info_dictionary objectForKey:@"ElectronMainProcess"] boolValue] != NO;
}
} // namespace
@ -48,7 +49,8 @@ base::FilePath MainApplicationBundlePath() {
}
NSBundle* MainApplicationBundle() {
return [NSBundle bundleWithPath:base::mac::FilePathToNSString(MainApplicationBundlePath())];
return [NSBundle bundleWithPath:base::mac::FilePathToNSString(
MainApplicationBundlePath())];
}
} // namespace brightray

12
brightray/common/main_delegate_mac.mm
View file

@ -43,16 +43,18 @@ void LoadCommonResources() {
}
void MainDelegate::OverrideFrameworkBundlePath() {
base::FilePath helper_path = GetFrameworksPath().Append(GetApplicationName() + " Framework.framework");
base::FilePath helper_path =
GetFrameworksPath().Append(GetApplicationName() + " Framework.framework");
base::mac::SetOverrideFrameworkBundlePath(helper_path);
}
void MainDelegate::OverrideChildProcessPath() {
base::FilePath helper_path = GetFrameworksPath().Append(GetApplicationName() + " Helper.app")
.Append("Contents")
.Append("MacOS")
.Append(GetApplicationName() + " Helper");
base::FilePath helper_path = GetFrameworksPath()
.Append(GetApplicationName() + " Helper.app")
.Append("Contents")
.Append("MacOS")
.Append(GetApplicationName() + " Helper");
PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
}