move gurl converter to gin (#19578)
This commit is contained in:
parent
8a9a5d69b6
commit
a8861e6a66
3 changed files with 39 additions and 11 deletions
|
@ -479,6 +479,7 @@ filenames = {
|
||||||
"shell/common/crash_reporter/win/crash_service_main.h",
|
"shell/common/crash_reporter/win/crash_service_main.h",
|
||||||
"shell/common/gin_converters/file_dialog_converter_gin_adapter.h",
|
"shell/common/gin_converters/file_dialog_converter_gin_adapter.h",
|
||||||
"shell/common/gin_converters/file_path_converter.h",
|
"shell/common/gin_converters/file_path_converter.h",
|
||||||
|
"shell/common/gin_converters/gurl_converter.h",
|
||||||
"shell/common/gin_converters/image_converter_gin_adapter.h",
|
"shell/common/gin_converters/image_converter_gin_adapter.h",
|
||||||
"shell/common/gin_converters/message_box_converter.cc",
|
"shell/common/gin_converters/message_box_converter.cc",
|
||||||
"shell/common/gin_converters/message_box_converter.h",
|
"shell/common/gin_converters/message_box_converter.h",
|
||||||
|
|
35
shell/common/gin_converters/gurl_converter.h
Normal file
35
shell/common/gin_converters/gurl_converter.h
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
// Copyright (c) 2019 GitHub, Inc.
|
||||||
|
// Use of this source code is governed by the MIT license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#ifndef SHELL_COMMON_GIN_CONVERTERS_GURL_CONVERTER_H_
|
||||||
|
#define SHELL_COMMON_GIN_CONVERTERS_GURL_CONVERTER_H_
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
#include "gin/converter.h"
|
||||||
|
#include "url/gurl.h"
|
||||||
|
|
||||||
|
namespace gin {
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct Converter<GURL> {
|
||||||
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, const GURL& val) {
|
||||||
|
return ConvertToV8(isolate, val.spec());
|
||||||
|
}
|
||||||
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
|
v8::Local<v8::Value> val,
|
||||||
|
GURL* out) {
|
||||||
|
std::string url;
|
||||||
|
if (Converter<std::string>::FromV8(isolate, val, &url)) {
|
||||||
|
*out = GURL(url);
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace gin
|
||||||
|
|
||||||
|
#endif // SHELL_COMMON_GIN_CONVERTERS_GURL_CONVERTER_H_
|
|
@ -5,28 +5,20 @@
|
||||||
#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
|
#ifndef SHELL_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
|
||||||
#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
|
#define SHELL_COMMON_NATIVE_MATE_CONVERTERS_GURL_CONVERTER_H_
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
#include "native_mate/converter.h"
|
#include "native_mate/converter.h"
|
||||||
#include "url/gurl.h"
|
#include "shell/common/gin_converters/gurl_converter.h"
|
||||||
|
|
||||||
namespace mate {
|
namespace mate {
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
struct Converter<GURL> {
|
struct Converter<GURL> {
|
||||||
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, const GURL& val) {
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, const GURL& val) {
|
||||||
return ConvertToV8(isolate, val.spec());
|
return gin::ConvertToV8(isolate, val);
|
||||||
}
|
}
|
||||||
static bool FromV8(v8::Isolate* isolate,
|
static bool FromV8(v8::Isolate* isolate,
|
||||||
v8::Local<v8::Value> val,
|
v8::Local<v8::Value> val,
|
||||||
GURL* out) {
|
GURL* out) {
|
||||||
std::string url;
|
return gin::ConvertFromV8(isolate, val, out);
|
||||||
if (Converter<std::string>::FromV8(isolate, val, &url)) {
|
|
||||||
*out = GURL(url);
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue