parent
86d23cee40
commit
22d8f22cfb
100 changed files with 417 additions and 417 deletions
|
@ -26,9 +26,9 @@ ui::ClipboardBuffer Clipboard::GetClipboardBuffer(gin_helper::Arguments* args) {
|
|||
return ui::ClipboardBuffer::kCopyPaste;
|
||||
}
|
||||
|
||||
std::vector<base::string16> Clipboard::AvailableFormats(
|
||||
std::vector<std::u16string> Clipboard::AvailableFormats(
|
||||
gin_helper::Arguments* args) {
|
||||
std::vector<base::string16> format_types;
|
||||
std::vector<std::u16string> format_types;
|
||||
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
|
||||
clipboard->ReadAvailableTypes(GetClipboardBuffer(args),
|
||||
/* data_dst = */ nullptr, &format_types);
|
||||
|
@ -80,7 +80,7 @@ void Clipboard::WriteBuffer(const std::string& format,
|
|||
void Clipboard::Write(const gin_helper::Dictionary& data,
|
||||
gin_helper::Arguments* args) {
|
||||
ui::ScopedClipboardWriter writer(GetClipboardBuffer(args));
|
||||
base::string16 text, html, bookmark;
|
||||
std::u16string text, html, bookmark;
|
||||
gfx::Image image;
|
||||
|
||||
if (data.Get("text", &text)) {
|
||||
|
@ -102,8 +102,8 @@ void Clipboard::Write(const gin_helper::Dictionary& data,
|
|||
writer.WriteImage(image.AsBitmap());
|
||||
}
|
||||
|
||||
base::string16 Clipboard::ReadText(gin_helper::Arguments* args) {
|
||||
base::string16 data;
|
||||
std::u16string Clipboard::ReadText(gin_helper::Arguments* args) {
|
||||
std::u16string data;
|
||||
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
|
||||
auto type = GetClipboardBuffer(args);
|
||||
if (clipboard->IsFormatAvailable(ui::ClipboardFormatType::GetPlainTextType(),
|
||||
|
@ -123,13 +123,13 @@ base::string16 Clipboard::ReadText(gin_helper::Arguments* args) {
|
|||
return data;
|
||||
}
|
||||
|
||||
void Clipboard::WriteText(const base::string16& text,
|
||||
void Clipboard::WriteText(const std::u16string& text,
|
||||
gin_helper::Arguments* args) {
|
||||
ui::ScopedClipboardWriter writer(GetClipboardBuffer(args));
|
||||
writer.WriteText(text);
|
||||
}
|
||||
|
||||
base::string16 Clipboard::ReadRTF(gin_helper::Arguments* args) {
|
||||
std::u16string Clipboard::ReadRTF(gin_helper::Arguments* args) {
|
||||
std::string data;
|
||||
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
|
||||
clipboard->ReadRTF(GetClipboardBuffer(args), /* data_dst = */ nullptr, &data);
|
||||
|
@ -141,9 +141,9 @@ void Clipboard::WriteRTF(const std::string& text, gin_helper::Arguments* args) {
|
|||
writer.WriteRTF(text);
|
||||
}
|
||||
|
||||
base::string16 Clipboard::ReadHTML(gin_helper::Arguments* args) {
|
||||
base::string16 data;
|
||||
base::string16 html;
|
||||
std::u16string Clipboard::ReadHTML(gin_helper::Arguments* args) {
|
||||
std::u16string data;
|
||||
std::u16string html;
|
||||
std::string url;
|
||||
uint32_t start;
|
||||
uint32_t end;
|
||||
|
@ -154,14 +154,14 @@ base::string16 Clipboard::ReadHTML(gin_helper::Arguments* args) {
|
|||
return data;
|
||||
}
|
||||
|
||||
void Clipboard::WriteHTML(const base::string16& html,
|
||||
void Clipboard::WriteHTML(const std::u16string& html,
|
||||
gin_helper::Arguments* args) {
|
||||
ui::ScopedClipboardWriter writer(GetClipboardBuffer(args));
|
||||
writer.WriteHTML(html, std::string());
|
||||
}
|
||||
|
||||
v8::Local<v8::Value> Clipboard::ReadBookmark(gin_helper::Arguments* args) {
|
||||
base::string16 title;
|
||||
std::u16string title;
|
||||
std::string url;
|
||||
gin_helper::Dictionary dict =
|
||||
gin_helper::Dictionary::CreateEmpty(args->isolate());
|
||||
|
@ -172,7 +172,7 @@ v8::Local<v8::Value> Clipboard::ReadBookmark(gin_helper::Arguments* args) {
|
|||
return dict.GetHandle();
|
||||
}
|
||||
|
||||
void Clipboard::WriteBookmark(const base::string16& title,
|
||||
void Clipboard::WriteBookmark(const std::u16string& title,
|
||||
const std::string& url,
|
||||
gin_helper::Arguments* args) {
|
||||
ui::ScopedClipboardWriter writer(GetClipboardBuffer(args));
|
||||
|
@ -207,9 +207,9 @@ void Clipboard::WriteImage(const gfx::Image& image,
|
|||
}
|
||||
|
||||
#if !defined(OS_MAC)
|
||||
void Clipboard::WriteFindText(const base::string16& text) {}
|
||||
base::string16 Clipboard::ReadFindText() {
|
||||
return base::string16();
|
||||
void Clipboard::WriteFindText(const std::u16string& text) {}
|
||||
std::u16string Clipboard::ReadFindText() {
|
||||
return std::u16string();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ namespace api {
|
|||
class Clipboard {
|
||||
public:
|
||||
static ui::ClipboardBuffer GetClipboardBuffer(gin_helper::Arguments* args);
|
||||
static std::vector<base::string16> AvailableFormats(
|
||||
static std::vector<std::u16string> AvailableFormats(
|
||||
gin_helper::Arguments* args);
|
||||
static bool Has(const std::string& format_string,
|
||||
gin_helper::Arguments* args);
|
||||
|
@ -34,27 +34,27 @@ class Clipboard {
|
|||
static void Write(const gin_helper::Dictionary& data,
|
||||
gin_helper::Arguments* args);
|
||||
|
||||
static base::string16 ReadText(gin_helper::Arguments* args);
|
||||
static void WriteText(const base::string16& text,
|
||||
static std::u16string ReadText(gin_helper::Arguments* args);
|
||||
static void WriteText(const std::u16string& text,
|
||||
gin_helper::Arguments* args);
|
||||
|
||||
static base::string16 ReadRTF(gin_helper::Arguments* args);
|
||||
static std::u16string ReadRTF(gin_helper::Arguments* args);
|
||||
static void WriteRTF(const std::string& text, gin_helper::Arguments* args);
|
||||
|
||||
static base::string16 ReadHTML(gin_helper::Arguments* args);
|
||||
static void WriteHTML(const base::string16& html,
|
||||
static std::u16string ReadHTML(gin_helper::Arguments* args);
|
||||
static void WriteHTML(const std::u16string& html,
|
||||
gin_helper::Arguments* args);
|
||||
|
||||
static v8::Local<v8::Value> ReadBookmark(gin_helper::Arguments* args);
|
||||
static void WriteBookmark(const base::string16& title,
|
||||
static void WriteBookmark(const std::u16string& title,
|
||||
const std::string& url,
|
||||
gin_helper::Arguments* args);
|
||||
|
||||
static gfx::Image ReadImage(gin_helper::Arguments* args);
|
||||
static void WriteImage(const gfx::Image& image, gin_helper::Arguments* args);
|
||||
|
||||
static base::string16 ReadFindText();
|
||||
static void WriteFindText(const base::string16& text);
|
||||
static std::u16string ReadFindText();
|
||||
static void WriteFindText(const std::u16string& text);
|
||||
|
||||
static v8::Local<v8::Value> ReadBuffer(const std::string& format_string,
|
||||
gin_helper::Arguments* args);
|
||||
|
|
|
@ -10,12 +10,12 @@ namespace electron {
|
|||
|
||||
namespace api {
|
||||
|
||||
void Clipboard::WriteFindText(const base::string16& text) {
|
||||
void Clipboard::WriteFindText(const std::u16string& text) {
|
||||
NSString* text_ns = base::SysUTF16ToNSString(text);
|
||||
[[FindPasteboard sharedInstance] setFindText:text_ns];
|
||||
}
|
||||
|
||||
base::string16 Clipboard::ReadFindText() {
|
||||
std::u16string Clipboard::ReadFindText() {
|
||||
return GetFindPboardText();
|
||||
}
|
||||
|
||||
|
|
|
@ -117,7 +117,7 @@ bool WriteShortcutLink(const base::FilePath& shortcut_path,
|
|||
|
||||
base::win::ShortcutProperties properties;
|
||||
base::FilePath path;
|
||||
base::string16 str;
|
||||
std::u16string str;
|
||||
UUID toastActivatorClsid;
|
||||
int index;
|
||||
if (options.Get("target", &path))
|
||||
|
|
|
@ -28,7 +28,7 @@ std::string GetApplicationUserAgent();
|
|||
#if defined(OS_WIN)
|
||||
PCWSTR GetRawAppUserModelID();
|
||||
bool GetAppUserModelID(ScopedHString* app_id);
|
||||
void SetAppUserModelID(const base::string16& name);
|
||||
void SetAppUserModelID(const std::u16string& name);
|
||||
bool IsRunningInDesktopBridge();
|
||||
#endif
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ namespace electron {
|
|||
|
||||
namespace {
|
||||
|
||||
base::string16 g_app_user_model_id;
|
||||
std::u16string g_app_user_model_id;
|
||||
}
|
||||
|
||||
const wchar_t kAppUserModelIDFormat[] = L"electron.app.$1";
|
||||
|
@ -42,7 +42,7 @@ std::string GetApplicationVersion() {
|
|||
return base::UTF16ToUTF8(info->product_version());
|
||||
}
|
||||
|
||||
void SetAppUserModelID(const base::string16& name) {
|
||||
void SetAppUserModelID(const std::u16string& name) {
|
||||
g_app_user_model_id = name;
|
||||
SetCurrentProcessExplicitAppUserModelID(g_app_user_model_id.c_str());
|
||||
}
|
||||
|
@ -54,7 +54,7 @@ PCWSTR GetRawAppUserModelID() {
|
|||
g_app_user_model_id = current_app_id;
|
||||
} else {
|
||||
std::string name = GetApplicationName();
|
||||
base::string16 generated_app_id = base::ReplaceStringPlaceholders(
|
||||
std::u16string generated_app_id = base::ReplaceStringPlaceholders(
|
||||
kAppUserModelIDFormat, base::UTF8ToUTF16(name), nullptr);
|
||||
SetAppUserModelID(generated_app_id);
|
||||
}
|
||||
|
|
|
@ -47,7 +47,7 @@ struct Converter<char16_t> {
|
|||
static bool FromV8(v8::Isolate* isolate,
|
||||
v8::Handle<v8::Value> val,
|
||||
char16_t* out) {
|
||||
base::string16 code = base::UTF8ToUTF16(gin::V8ToString(isolate, val));
|
||||
std::u16string code = base::UTF8ToUTF16(gin::V8ToString(isolate, val));
|
||||
if (code.length() != 1)
|
||||
return false;
|
||||
*out = code[0];
|
||||
|
@ -206,7 +206,7 @@ bool Converter<blink::WebKeyboardEvent>::FromV8(v8::Isolate* isolate,
|
|||
// Make sure to not read beyond the buffer in case some bad code doesn't
|
||||
// NULL-terminate it (this is called from plugins).
|
||||
size_t text_length_cap = blink::WebKeyboardEvent::kTextLengthCap;
|
||||
base::string16 text16 = base::UTF8ToUTF16(str);
|
||||
std::u16string text16 = base::UTF8ToUTF16(str);
|
||||
|
||||
std::fill_n(out->text, text_length_cap, 0);
|
||||
std::fill_n(out->unmodified_text, text_length_cap, 0);
|
||||
|
@ -365,7 +365,7 @@ v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags) {
|
|||
|
||||
bool pasteFlag = false;
|
||||
if (editFlags & blink::ContextMenuDataEditFlags::kCanPaste) {
|
||||
std::vector<base::string16> types;
|
||||
std::vector<std::u16string> types;
|
||||
ui::Clipboard::GetForCurrentThread()->ReadAvailableTypes(
|
||||
ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ nullptr, &types);
|
||||
pasteFlag = !types.empty();
|
||||
|
|
|
@ -18,7 +18,7 @@ std::vector<std::string> GetPreferredLanguages();
|
|||
|
||||
#if defined(OS_WIN)
|
||||
bool GetPreferredLanguagesUsingGlobalization(
|
||||
std::vector<base::string16>* languages);
|
||||
std::vector<std::u16string>* languages);
|
||||
#endif
|
||||
|
||||
} // namespace electron
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
namespace electron {
|
||||
|
||||
std::vector<std::string> GetPreferredLanguages() {
|
||||
std::vector<base::string16> languages16;
|
||||
std::vector<std::u16string> languages16;
|
||||
|
||||
// Attempt to use API available on Windows 10 or later, which
|
||||
// returns the full list of language preferences.
|
||||
|
@ -33,7 +33,7 @@ std::vector<std::string> GetPreferredLanguages() {
|
|||
}
|
||||
|
||||
bool GetPreferredLanguagesUsingGlobalization(
|
||||
std::vector<base::string16>* languages) {
|
||||
std::vector<std::u16string>* languages) {
|
||||
if (base::win::GetVersion() < base::win::Version::WIN10)
|
||||
return false;
|
||||
if (!base::win::ResolveCoreWinRTDelayload() ||
|
||||
|
|
|
@ -241,8 +241,8 @@ std::string OpenExternalOnWorkerThread(
|
|||
// Quote the input scheme to be sure that the command does not have
|
||||
// parameters unexpected by the external program. This url should already
|
||||
// have been escaped.
|
||||
base::string16 escaped_url = L"\"" + base::UTF8ToUTF16(url.spec()) + L"\"";
|
||||
base::string16 working_dir = options.working_dir.value();
|
||||
std::u16string escaped_url = L"\"" + base::UTF8ToUTF16(url.spec()) + L"\"";
|
||||
std::u16string working_dir = options.working_dir.value();
|
||||
|
||||
if (reinterpret_cast<ULONG_PTR>(
|
||||
ShellExecuteW(nullptr, L"open", escaped_url.c_str(), nullptr,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue