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

set client id on AtomNetworkDelegate instead of cmd line switch

Browse source
This commit is contained in:
deepak1556 2016-04-18 11:35:24 +05:30
parent fcf04377d7
commit b8e04f4947
5 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/api/atom_api_session.cc
View file

@ -22,8 +22,6 @@
#include "atom/common/native_mate_converters/file_path_converter.h"
#include "atom/common/native_mate_converters/net_converter.h"
#include "atom/common/node_includes.h"
#include "atom/common/options_switches.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/guid.h"
#include "base/prefs/pref_service.h"
@ -288,12 +286,6 @@ void ClearHostResolverCacheInIO(
}
}
void SetDevToolsNetworkEmulationClientId(const std::string& id) {
auto cmd_line = base::CommandLine::ForCurrentProcess();
cmd_line->AppendSwitchASCII(
switches::kDevToolsEmulateNetworkConditionsClientId, id);
}
} // namespace
Session::Session(AtomBrowserContext* browser_context)
@ -394,14 +386,16 @@ void Session::EnableNetworkEmulation(const mate::Dictionary& options) {
browser_context_->network_controller_handle()->SetNetworkState(
devtools_network_emulation_client_id_, std::move(conditions));
SetDevToolsNetworkEmulationClientId(devtools_network_emulation_client_id_);
browser_context_->network_delegate()->SetDevToolsNetworkEmulationClientId(
devtools_network_emulation_client_id_);
}
void Session::DisableNetworkEmulation() {
scoped_ptr<brightray::DevToolsNetworkConditions> conditions;
browser_context_->network_controller_handle()->SetNetworkState(
devtools_network_emulation_client_id_, std::move(conditions));
SetDevToolsNetworkEmulationClientId(std::string());
browser_context_->network_delegate()->SetDevToolsNetworkEmulationClientId(
std::string());
}
void Session::SetCertVerifyProc(v8::Local<v8::Value> val,