bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Remove GTK+ dependency and add initial Aura/X11 implementation (issue #1258)

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1708 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-05-22 21:01:22 +00:00
parent 921c25f0af
commit 3859457eef
46 changed files with 1196 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libcef/browser/browser_host_impl.cc
View File

@@ -319,8 +319,8 @@ CefRefPtr<CefBrowser> CefBrowserHost::CreateBrowserSync(
}
CefRefPtr<CefBrowserHostImpl> browser =
CefBrowserHostImpl::Create(windowInfo, client, url, settings, NULL, false,
request_context);
CefBrowserHostImpl::Create(windowInfo, client, url, settings,
kNullWindowHandle, false, request_context);
return browser.get();
}
@@ -362,7 +362,7 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::CreateInternal(
DCHECK(browser_info.get());
// If |opener| is non-NULL it must be a popup window.
DCHECK(opener == NULL || browser_info->is_popup());
DCHECK(opener == kNullWindowHandle || browser_info->is_popup());
if (!web_contents) {
CefBrowserContext* browser_context = NULL;
@@ -1738,7 +1738,7 @@ void CefBrowserHostImpl::WebContentsCreated(
content::RenderViewHost* view_host = new_contents->GetRenderViewHost();
content::RenderFrameHost* main_frame_host = new_contents->GetMainFrame();
CefWindowHandle opener = NULL;
CefWindowHandle opener = kNullWindowHandle;
scoped_refptr<CefBrowserInfo> info =
CefContentBrowserClient::Get()->GetOrCreateBrowserInfo(
view_host->GetProcess()->GetID(),
@@ -2161,6 +2161,9 @@ CefBrowserHostImpl::CefBrowserHostImpl(
#if defined(USE_AURA)
window_widget_ = NULL;
#endif
#if defined(USE_X11)
window_x11_ = NULL;
#endif
DCHECK(!browser_info_->browser().get());
browser_info_->set_browser(this);