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

Use object for options

Browse source
This commit is contained in:
Yury Solovyov 2016-11-03 21:23:40 +03:00 committed by Kevin Sawicki
parent bec671bac8
commit 05cb26a174
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
atom/browser/api/atom_api_app.cc
View file

@ -315,26 +315,6 @@ struct Converter<Browser::LoginItemSettings> {
} }
}; };
template <>
struct Converter<IconLoader::IconSize> {
static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val,
IconLoader::IconSize* out) {
std::string icon_size_string;
if (!ConvertFromV8(isolate, val, &icon_size_string))
return false;
if (icon_size_string == "small")
*out = IconLoader::IconSize::SMALL;
else if (icon_size_string == "normal")
*out = IconLoader::IconSize::NORMAL;
else if (icon_size_string == "large")
*out = IconLoader::IconSize::LARGE;
else
return false;
return true;
}
};
template<> template<>
struct Converter<content::CertificateRequestResultType> { struct Converter<content::CertificateRequestResultType> {
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val, static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val,
@ -356,6 +336,15 @@ namespace api {
namespace { namespace {
IconLoader::IconSize GetIconSizeByString(std::string size) {
if (size == "small") {
return IconLoader::IconSize::SMALL;
} else if (size == "large") {
return IconLoader::IconSize::LARGE;
}
return IconLoader::IconSize::NORMAL;
};
// Return the path constant from string. // Return the path constant from string.
int GetPathConstant(const std::string& name) { int GetPathConstant(const std::string& name) {
if (name == "appData") if (name == "appData")
@ -869,11 +858,16 @@ JumpListResult App::SetJumpList(v8::Local<v8::Value> val,
void App::GetFileIcon(const base::FilePath& path, void App::GetFileIcon(const base::FilePath& path,
mate::Arguments* args) { mate::Arguments* args) {
base::DictionaryValue options;
IconLoader::IconSize icon_size; IconLoader::IconSize icon_size;
FileIconCallback callback; FileIconCallback callback;
if (!args->GetNext(&icon_size)) { if (!args->GetNext(&options)) {
icon_size = IconLoader::IconSize::NORMAL; icon_size = IconLoader::IconSize::NORMAL;
} else {
std::string icon_size_string;
options.GetString("size", &icon_size_string);
icon_size = GetIconSizeByString(icon_size_string);
} }
if (!args->GetNext(&callback)) { if (!args->GetNext(&callback)) {