github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 74.0.3729.27 (master) (#17345)

Browse Source 
* chore: bump chromium to 74.0.3729.5 (master)

* Remove ScopedBlockingCall constructor without location

https://chromium-review.googlesource.com/c/chromium/src/+/1496560

* Use XCode 9.4.1 for Mac SDK 10.13

* chore: roll chromium 74.0.3729.27
This commit is contained in:
Jeremy Apthorp
2019-03-21 08:45:22 -07:00
committed by John Kleinschmidt
parent 07b02653ba
commit 6555be2636
48 changed files with 170 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
atom/browser/common_web_contents_delegate.cc
View File

@@ -126,14 +126,16 @@ std::unique_ptr<base::DictionaryValue> CreateFileSystemValue(
}
void WriteToFile(const base::FilePath& path, const std::string& content) {
base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK);
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
base::BlockingType::WILL_BLOCK);
DCHECK(!path.empty());
base::WriteFile(path, content.data(), content.size());
}
void AppendToFile(const base::FilePath& path, const std::string& content) {
base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK);
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
base::BlockingType::WILL_BLOCK);
DCHECK(!path.empty());
base::AppendToFile(path, content.data(), content.size());

3
atom/common/platform_util_win.cc
View File

@@ -231,7 +231,8 @@ HRESULT DeleteFileProgressSink::ResumeTimer() {
}
void ShowItemInFolderOnWorkerThread(const base::FilePath& full_path) {
base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
base::BlockingType::MAY_BLOCK);
base::win::ScopedCOMInitializer com_initializer;
if (!com_initializer.Succeeded())
return;