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

Fix up Windows build errors

Browse source
This commit is contained in:
Paul Betts 2015-12-07 10:02:06 -08:00
parent d0be6c7411
commit 3931ebb7ef
8 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/browser_win.cc
View file

@ -127,7 +127,7 @@ void Browser::SetUserTasks(const std::vector<UserTask>& tasks) {
PCWSTR Browser::GetAppUserModelID() {
if (app_user_model_id_.empty()) {
SetAppUserModelID(ReplaceStringPlaceholders(
SetAppUserModelID(base::ReplaceStringPlaceholders(
kAppUserModelIDFormat, base::UTF8ToUTF16(GetName()), nullptr));
}

6
atom/browser/ui/file_dialog_win.cc
View file

@ -51,7 +51,7 @@ void ConvertFilters(const Filters& filters,
std::vector<std::string> extensions(filter.second);
for (size_t j = 0; j < extensions.size(); ++j)
extensions[j].insert(0, "*.");
buffer->push_back(base::UTF8ToWide(JoinString(extensions, ";")));
buffer->push_back(base::UTF8ToWide(base::JoinString(extensions, ";")));
spec.pszSpec = buffer->back().c_str();
filterspec->push_back(spec);
@ -273,7 +273,9 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
bool matched = false;
for (size_t i = 0; i < filter.second.size(); ++i) {
if (filter.second[i] == "*" ||
base::EndsWith(file_name, filter.second[i], false)) {
base::EndsWith(
file_name, filter.second[i],
base::CompareCase::INSENSITIVE_ASCII)) {
matched = true;
break;;
}