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

fix: empty result of webContents.getUserAgent() (#35069)

Browse source 
fix: empty result of webContents.getUserAgent()
This commit is contained in:
Shelley Vohr 2022-07-29 17:09:47 +02:00 • committed by GitHub
parent 8004cb8722
commit 9028bb79a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
shell/browser/api/electron_api_web_contents.cc
View file

@ -675,10 +675,8 @@ WebContents::WebContents(v8::Isolate* isolate,
auto session = Session::CreateFrom(isolate, GetBrowserContext());
session_.Reset(isolate, session.ToV8());
absl::optional<std::string> user_agent_override =
GetBrowserContext()->GetUserAgentOverride();
if (user_agent_override)
SetUserAgent(*user_agent_override);
SetUserAgent(GetBrowserContext()->GetUserAgent());
web_contents->SetUserData(kElectronApiWebContentsKey,
std::make_unique<UserDataLink>(GetWeakPtr()));
InitZoomController(web_contents, gin::Dictionary::CreateEmpty(isolate));
@ -884,10 +882,7 @@ void WebContents::InitWithSessionAndOptions(
AutofillDriverFactory::CreateForWebContents(web_contents());
absl::optional<std::string> user_agent_override =
GetBrowserContext()->GetUserAgentOverride();
if (user_agent_override)
SetUserAgent(*user_agent_override);
SetUserAgent(GetBrowserContext()->GetUserAgent());
if (IsGuest()) {
NativeWindow* owner_window = nullptr;