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

Simplify how we find NativeWindow from WebContents

Browse source
This commit is contained in:
Cheng Zhao 2015-05-20 10:27:16 +08:00
parent cda8b119e2
commit 7c69c2846b
4 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
atom/browser/native_window.cc
View file

@ -169,18 +169,13 @@ NativeWindow* NativeWindow::Create(const mate::Dictionary& options) {
}
// static
NativeWindow* NativeWindow::FromRenderView(int process_id, int routing_id) {
// Stupid iterating.
NativeWindow* NativeWindow::FromWebContents(
content::WebContents* web_contents) {
WindowList& window_list = *WindowList::GetInstance();
for (auto w = window_list.begin(); w != window_list.end(); ++w) {
auto& window = *w;
content::WebContents* web_contents = window->GetWebContents();
int window_process_id = web_contents->GetRenderProcessHost()->GetID();
int window_routing_id = web_contents->GetRoutingID();
if (window_routing_id == routing_id && window_process_id == process_id)
for (NativeWindow* window : window_list) {
if (window->GetWebContents() == web_contents)
return window;
}
return nullptr;
}