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

fix: compile error in netlog (#18443)

Browse source
This commit is contained in:
Jeremy Apthorp 2019-05-24 10:54:32 -07:00 committed by GitHub
parent 54cbe5f749
commit cbc177708e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
atom/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 // TODO(deepak1556): Provide more flexibility to this module
// by allowing customizations on the capturing options. // by allowing customizations on the capturing options.
auto capture_mode = network::mojom::NetLogCaptureMode::DEFAULT; auto capture_mode = net::NetLogCaptureMode::Default();
auto max_file_size = network::mojom::NetLogExporter::kUnlimitedFileSize; auto max_file_size = network::mojom::NetLogExporter::kUnlimitedFileSize;
base::PostTaskAndReplyWithResult( base::PostTaskAndReplyWithResult(
@ -105,11 +105,10 @@ v8::Local<v8::Promise> NetLog::StartLogging(mate::Arguments* args) {
return handle; return handle;
} }
void NetLog::StartNetLogAfterCreateFile( void NetLog::StartNetLogAfterCreateFile(net::NetLogCaptureMode capture_mode,
network::mojom::NetLogCaptureMode capture_mode, uint64_t max_file_size,
uint64_t max_file_size, base::Value custom_constants,
base::Value custom_constants, base::File output_file) {
base::File output_file) {
if (!net_log_exporter_) { if (!net_log_exporter_) {
// Theoretically the mojo pipe could have been closed by the time we get // Theoretically the mojo pipe could have been closed by the time we get
// here via the connection error handler. If so, the promise has already // here via the connection error handler. If so, the promise has already

9
atom/browser/api/atom_api_net_log.h
View file

@ -41,11 +41,10 @@ class NetLog : public mate::TrackableObject<NetLog> {
void OnConnectionError(); void OnConnectionError();
void StartNetLogAfterCreateFile( void StartNetLogAfterCreateFile(net::NetLogCaptureMode capture_mode,
network::mojom::NetLogCaptureMode capture_mode, uint64_t max_file_size,
uint64_t max_file_size, base::Value custom_constants,
base::Value custom_constants, base::File output_file);
base::File output_file);
void NetLogStarted(int32_t error); void NetLogStarted(int32_t error);
private: private: