bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-17 04:30:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mac: Fix compile/build errors due to Chromium update

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1468 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-10-17 15:13:25 +00:00
parent d816fde859
commit 56c1a740aa
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cef.gyp
View File

@ -142,7 +142,7 @@
'action': [ 'action': [
'cp', 'cp',
'-Rf', '-Rf',
'${BUILT_PRODUCTS_DIR}/../../third_party/WebKit/Source/core/Resources/', '${BUILT_PRODUCTS_DIR}/../../third_party/WebKit/public/resources/',
'${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/Chromium Embedded Framework.framework/Resources/' '${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/Chromium Embedded Framework.framework/Resources/'
], ],
}, },
@ -369,7 +369,7 @@
'action': [ 'action': [
'cp', 'cp',
'-Rf', '-Rf',
'${BUILT_PRODUCTS_DIR}/../../third_party/WebKit/Source/core/Resources/', '${BUILT_PRODUCTS_DIR}/../../third_party/WebKit/public/resources/',
'${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/Chromium Embedded Framework.framework/Resources/' '${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Contents/Frameworks/Chromium Embedded Framework.framework/Resources/'
], ],
}, },

2
libcef/browser/browser_host_impl.cc
View File

@ -644,7 +644,7 @@ void CefBrowserHostImpl::WasHidden(bool hidden) {
if (!CEF_CURRENTLY_ON_UIT()) { if (!CEF_CURRENTLY_ON_UIT()) {
CEF_POST_TASK(CEF_UIT, CEF_POST_TASK(CEF_UIT,
base::Bind(&CefBrowserHostImpl::WasHidden, this, hidden)); base::Bind(&CefBrowserHost::WasHidden, this, hidden));
return; return;
} }

1
libcef/browser/browser_host_impl.h
View File

@ -332,6 +332,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
// content::WebContentsObserver methods. // content::WebContentsObserver methods.
using content::WebContentsObserver::BeforeUnloadFired; using content::WebContentsObserver::BeforeUnloadFired;
using content::WebContentsObserver::WasHidden;
virtual void RenderViewCreated( virtual void RenderViewCreated(
content::RenderViewHost* render_view_host) OVERRIDE; content::RenderViewHost* render_view_host) OVERRIDE;
virtual void RenderViewDeleted( virtual void RenderViewDeleted(