mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-05 13:37:41 +01:00
Mac: Fix compile errors due to revision 394 changes.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@395 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
7361732f92
commit
f53b15ca11
@ -37,12 +37,15 @@
|
||||
#include "webkit/glue/webkit_glue.h"
|
||||
|
||||
#if defined(OS_WIN)
|
||||
|
||||
#include <winhttp.h>
|
||||
#pragma comment(lib, "winhttp.lib")
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
|
||||
namespace {
|
||||
|
||||
#if defined(OS_WIN)
|
||||
|
||||
// ProxyConfigService implementation that does nothing.
|
||||
class ProxyConfigServiceNull : public net::ProxyConfigService {
|
||||
public:
|
||||
@ -55,6 +58,8 @@ public:
|
||||
virtual void OnLazyPoll() OVERRIDE {}
|
||||
};
|
||||
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
// ProxyResolver implementation that forewards resolution to a CefProxyHandler.
|
||||
class CefProxyResolver : public net::ProxyResolver {
|
||||
public:
|
||||
@ -118,7 +123,6 @@ net::ProxyConfigService* CreateProxyConfigService() {
|
||||
|
||||
} // namespace
|
||||
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
BrowserRequestContext::BrowserRequestContext()
|
||||
: ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)),
|
||||
|
@ -11,7 +11,7 @@
|
||||
namespace printing {
|
||||
|
||||
// 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()
|
||||
: page_type(PT_LETTER),
|
||||
|
Loading…
x
Reference in New Issue
Block a user