From 56c1a740aa816cec1162a3de5f4e057624439e72 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 17 Oct 2013 15:13:25 +0000 Subject: [PATCH] Mac: Fix compile/build errors due to Chromium update git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1468 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef.gyp | 4 ++-- libcef/browser/browser_host_impl.cc | 2 +- libcef/browser/browser_host_impl.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cef.gyp b/cef.gyp index 26b5d7df2..85cb6ce21 100644 --- a/cef.gyp +++ b/cef.gyp @@ -142,7 +142,7 @@ 'action': [ 'cp', '-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/' ], }, @@ -369,7 +369,7 @@ 'action': [ 'cp', '-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/' ], }, diff --git a/libcef/browser/browser_host_impl.cc b/libcef/browser/browser_host_impl.cc index 304b247db..b053aadb8 100644 --- a/libcef/browser/browser_host_impl.cc +++ b/libcef/browser/browser_host_impl.cc @@ -644,7 +644,7 @@ void CefBrowserHostImpl::WasHidden(bool hidden) { if (!CEF_CURRENTLY_ON_UIT()) { CEF_POST_TASK(CEF_UIT, - base::Bind(&CefBrowserHostImpl::WasHidden, this, hidden)); + base::Bind(&CefBrowserHost::WasHidden, this, hidden)); return; } diff --git a/libcef/browser/browser_host_impl.h b/libcef/browser/browser_host_impl.h index dd5be9832..0c559e3e8 100644 --- a/libcef/browser/browser_host_impl.h +++ b/libcef/browser/browser_host_impl.h @@ -332,6 +332,7 @@ class CefBrowserHostImpl : public CefBrowserHost, // content::WebContentsObserver methods. using content::WebContentsObserver::BeforeUnloadFired; + using content::WebContentsObserver::WasHidden; virtual void RenderViewCreated( content::RenderViewHost* render_view_host) OVERRIDE; virtual void RenderViewDeleted(