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

WindowOpenDisposition has become enum class

Browse source
This commit is contained in:
Cheng Zhao 2017-01-24 16:50:02 +09:00 • committed by Kevin Sawicki
parent 6d5339b74e
commit 4a14b17255
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
atom/browser/api/atom_api_web_contents.cc
View file

@ -130,12 +130,24 @@ struct Converter<WindowOpenDisposition> {
WindowOpenDisposition val) { WindowOpenDisposition val) {
std::string disposition = "other"; std::string disposition = "other";
switch (val) { switch (val) {
case CURRENT_TAB: disposition = "default"; break; case WindowOpenDisposition::CURRENT_TAB:
case NEW_FOREGROUND_TAB: disposition = "foreground-tab"; break; disposition = "default";
case NEW_BACKGROUND_TAB: disposition = "background-tab"; break; break;
case NEW_POPUP: case NEW_WINDOW: disposition = "new-window"; break; case WindowOpenDisposition::NEW_FOREGROUND_TAB:
case SAVE_TO_DISK: disposition = "save-to-disk"; break; disposition = "foreground-tab";
default: break; break;
case WindowOpenDisposition::NEW_BACKGROUND_TAB:
disposition = "background-tab";
break;
case WindowOpenDisposition::NEW_POPUP:
case WindowOpenDisposition::NEW_WINDOW:
disposition = "new-window";
break;
case WindowOpenDisposition::SAVE_TO_DISK:
disposition = "save-to-disk";
break;
default:
break;
} }
return mate::ConvertToV8(isolate, disposition); return mate::ConvertToV8(isolate, disposition);
} }
@ -431,7 +443,7 @@ void WebContents::AddNewContents(content::WebContents* source,
content::WebContents* WebContents::OpenURLFromTab( content::WebContents* WebContents::OpenURLFromTab(
content::WebContents* source, content::WebContents* source,
const content::OpenURLParams& params) { const content::OpenURLParams& params) {
if (params.disposition != CURRENT_TAB) { if (params.disposition != WindowOpenDisposition::CURRENT_TAB) {
if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN) if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
Emit("-new-window", params.url, "", params.disposition); Emit("-new-window", params.url, "", params.disposition);
else else
@ -1080,7 +1092,7 @@ void WebContents::InspectServiceWorker() {
for (const auto& agent_host : content::DevToolsAgentHost::GetOrCreateAll()) { for (const auto& agent_host : content::DevToolsAgentHost::GetOrCreateAll()) {
if (agent_host->GetType() == if (agent_host->GetType() ==
content::DevToolsAgentHost::TYPE_SERVICE_WORKER) { content::DevToolsAgentHost::kTypeServiceWorker) {
OpenDevTools(nullptr); OpenDevTools(nullptr);
managed_web_contents()->AttachTo(agent_host); managed_web_contents()->AttachTo(agent_host);
break; break;