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

A little clean up

Browse source
This commit is contained in:
Cheng Zhao 2015-02-05 00:17:45 -08:00
commit 071a55974a
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,13 +39,13 @@ v8::Persistent<v8::ObjectTemplate> template_;
// Get the window that has the |guest| embedded. // Get the window that has the |guest| embedded.
NativeWindow* GetWindowFromGuest(const content::WebContents* guest) { NativeWindow* GetWindowFromGuest(const content::WebContents* guest) {
auto process = guest->GetRenderProcessHost();
WebViewManager::WebViewInfo info; WebViewManager::WebViewInfo info;
if (WebViewManager::GetInfoForProcess(process, &info)) if (WebViewManager::GetInfoForProcess(guest->GetRenderProcessHost(), &info))
return nullptr;
return NativeWindow::FromRenderView( return NativeWindow::FromRenderView(
info.embedder->GetRenderProcessHost()->GetID(), info.embedder->GetRenderProcessHost()->GetID(),
info.embedder->GetRoutingID()); info.embedder->GetRoutingID());
else
return nullptr;
} }
} // namespace } // namespace

5
atom/browser/api/atom_api_web_view_manager.cc
View file

@ -3,9 +3,9 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "atom/browser/api/atom_api_web_contents.h" #include "atom/browser/api/atom_api_web_contents.h"
#include "atom/browser/atom_browser_context.h"
#include "atom/browser/web_view_manager.h" #include "atom/browser/web_view_manager.h"
#include "atom/common/native_mate_converters/gurl_converter.h" #include "atom/common/native_mate_converters/gurl_converter.h"
#include "content/public/browser/browser_context.h"
#include "native_mate/dictionary.h" #include "native_mate/dictionary.h"
#include "net/base/filename_util.h" #include "net/base/filename_util.h"
@ -56,9 +56,10 @@ atom::WebViewManager* GetWebViewManager(content::WebContents* web_contents) {
if (context) { if (context) {
auto manager = context->GetGuestManager(); auto manager = context->GetGuestManager();
return static_cast<atom::WebViewManager*>(manager); return static_cast<atom::WebViewManager*>(manager);
} } else {
return nullptr; return nullptr;
} }
}
void AddGuest(int guest_instance_id, void AddGuest(int guest_instance_id,
int element_instance_id, int element_instance_id,