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

chore: bump chromium to 79eae5b7b2d9dac441ac0182ee160 (master) (#19166)

Browse source
This commit is contained in:
Electron Bot 2019-07-24 15:58:51 -07:00 • committed by Jeremy Apthorp
parent 6d83eaaf4b
commit bd526f97a5
92 changed files with 507 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/atom_api_net_log.cc
View file

@ -92,7 +92,7 @@ v8::Local<v8::Promise> NetLog::StartLogging(mate::Arguments* args) {
// TODO(deepak1556): Provide more flexibility to this module
// by allowing customizations on the capturing options.
auto capture_mode = net::NetLogCaptureMode::Default();
auto capture_mode = net::NetLogCaptureMode::kDefault;
auto max_file_size = network::mojom::NetLogExporter::kUnlimitedFileSize;
base::PostTaskAndReplyWithResult(

6
shell/browser/api/atom_api_top_level_window.cc
View file

@ -523,14 +523,16 @@ void TopLevelWindow::SetAlwaysOnTop(bool top, mate::Arguments* args) {
args->GetNext(&relative_level);
std::string error;
window_->SetAlwaysOnTop(top, level, relative_level, &error);
ui::ZOrderLevel z_order =
top ? ui::ZOrderLevel::kFloatingWindow : ui::ZOrderLevel::kNormal;
window_->SetAlwaysOnTop(z_order, level, relative_level, &error);
if (!error.empty())
args->ThrowError(error);
}
bool TopLevelWindow::IsAlwaysOnTop() {
return window_->IsAlwaysOnTop();
return window_->GetZOrderLevel() != ui::ZOrderLevel::kNormal;
}
void TopLevelWindow::Center() {

9
shell/browser/api/atom_api_url_request_ns.cc
View file

@ -7,6 +7,7 @@
#include <utility>
#include "content/public/browser/storage_partition.h"
#include "mojo/public/cpp/system/string_data_source.h"
#include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h"
#include "shell/browser/api/atom_api_session.h"
@ -91,7 +92,7 @@ class UploadDataPipeGetter {
void SetPipe(mojo::ScopedDataPipeProducerHandle pipe) {
request_->producer_ =
std::make_unique<mojo::StringDataPipeProducer>(std::move(pipe));
std::make_unique<mojo::DataPipeProducer>(std::move(pipe));
request_->StartWriting();
}
@ -467,9 +468,9 @@ void URLRequestNS::DoWrite() {
DCHECK(producer_);
DCHECK(!pending_writes_.empty());
producer_->Write(
pending_writes_.front(),
mojo::StringDataPipeProducer::AsyncWritingMode::
STRING_STAYS_VALID_UNTIL_COMPLETION,
std::make_unique<mojo::StringDataSource>(
pending_writes_.front(), mojo::StringDataSource::AsyncWritingMode::
STRING_STAYS_VALID_UNTIL_COMPLETION),
base::BindOnce(&URLRequestNS::OnWrite, weak_factory_.GetWeakPtr()));
}

4
shell/browser/api/atom_api_url_request_ns.h
View file

@ -10,7 +10,7 @@
#include <string>
#include <vector>
#include "mojo/public/cpp/system/string_data_pipe_producer.h"
#include "mojo/public/cpp/system/data_pipe_producer.h"
#include "native_mate/dictionary.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
#include "services/network/public/cpp/simple_url_loader.h"
@ -109,7 +109,7 @@ class URLRequestNS : public mate::EventEmitter<URLRequestNS>,
// Passed from DataPipeGetter for streaming data.
network::mojom::DataPipeGetter::ReadCallback size_callback_;
std::unique_ptr<mojo::StringDataPipeProducer> producer_;
std::unique_ptr<mojo::DataPipeProducer> producer_;
// Whether request.end() has been called.
bool last_chunk_written_ = false;