electron/shell/browser/api/electron_api_app_mac.mm
loc cd0dda0125
fix: allow blocking IO for setAppLogsPath to avoid DCHECK (#23111)
* fix: let setAppLogsPath write to disk on UI thread

Otherwise, the DCHECK in thread_restrictions will fire.

* scope the io allowance more tightly

* oops, scope it tightly in the mac version too
2020-04-21 12:28:01 -07:00

63 lines
1.9 KiB
Text

// Copyright (c) 2019 GitHub, Inc.
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include <string>
#include "base/path_service.h"
#include "shell/browser/api/electron_api_app.h"
#include "shell/browser/electron_paths.h"
#import <Cocoa/Cocoa.h>
namespace electron {
namespace api {
void App::SetAppLogsPath(gin_helper::ErrorThrower thrower,
base::Optional<base::FilePath> custom_path) {
if (custom_path.has_value()) {
if (!custom_path->IsAbsolute()) {
thrower.ThrowError("Path must be absolute");
return;
}
{
base::ThreadRestrictions::ScopedAllowIO allow_io;
base::PathService::Override(DIR_APP_LOGS, custom_path.value());
}
} else {
NSString* bundle_name =
[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
NSString* logs_path =
[NSString stringWithFormat:@"Library/Logs/%@", bundle_name];
NSString* library_path =
[NSHomeDirectory() stringByAppendingPathComponent:logs_path];
{
base::ThreadRestrictions::ScopedAllowIO allow_io;
base::PathService::Override(DIR_APP_LOGS,
base::FilePath([library_path UTF8String]));
}
}
}
void App::SetActivationPolicy(gin_helper::ErrorThrower thrower,
const std::string& policy) {
NSApplicationActivationPolicy activation_policy;
if (policy == "accessory") {
activation_policy = NSApplicationActivationPolicyAccessory;
} else if (policy == "prohibited") {
activation_policy = NSApplicationActivationPolicyProhibited;
} else if (policy == "regular") {
activation_policy = NSApplicationActivationPolicyRegular;
} else {
thrower.ThrowError("Invalid activation policy: must be one of 'regular', "
"'accessory', or 'prohibited'");
return;
}
[NSApp setActivationPolicy:activation_policy];
}
} // namespace api
} // namespace electron