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

Mac: Fix compile errors due to revision 394 changes.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@395 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-11-23 23:22:01 +00:00
parent 7361732f92
commit f53b15ca11
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/browser_request_context.cc
View File

@ -37,12 +37,15 @@
#include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkit_glue.h"
#if defined(OS_WIN) #if defined(OS_WIN)
#include <winhttp.h> #include <winhttp.h>
#pragma comment(lib, "winhttp.lib") #pragma comment(lib, "winhttp.lib")
#endif // defined(OS_WIN)
namespace { namespace {
#if defined(OS_WIN)
// ProxyConfigService implementation that does nothing. // ProxyConfigService implementation that does nothing.
class ProxyConfigServiceNull : public net::ProxyConfigService { class ProxyConfigServiceNull : public net::ProxyConfigService {
public: public:
@ -55,6 +58,8 @@ public:
virtual void OnLazyPoll() OVERRIDE {} virtual void OnLazyPoll() OVERRIDE {}
}; };
#endif // defined(OS_WIN)
// ProxyResolver implementation that forewards resolution to a CefProxyHandler. // ProxyResolver implementation that forewards resolution to a CefProxyHandler.
class CefProxyResolver : public net::ProxyResolver { class CefProxyResolver : public net::ProxyResolver {
public: public:
@ -118,7 +123,6 @@ net::ProxyConfigService* CreateProxyConfigService() {
} // namespace } // namespace
#endif // defined(OS_WIN)
BrowserRequestContext::BrowserRequestContext() BrowserRequestContext::BrowserRequestContext()
: ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)), : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)),

2
libcef/printing/print_settings.cc
View File

@ -11,7 +11,7 @@
namespace printing { namespace printing {
// Global SequenceNumber used for generating unique cookie values. // Global SequenceNumber used for generating unique cookie values.
static base::AtomicSequenceNumber cookie_seq(base::LINKER_INITIALIZED); static base::AtomicSequenceNumber cookie_seq = LAZY_INSTANCE_INITIALIZER;
PageMeasurements::PageMeasurements() PageMeasurements::PageMeasurements()
: page_type(PT_LETTER), : page_type(PT_LETTER),