From f53b15ca118ec70ff33e60082cc215ffa19de781 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 23 Nov 2011 23:22:01 +0000 Subject: [PATCH] Mac: Fix compile errors due to revision 394 changes. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@395 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser_request_context.cc | 8 ++++++-- libcef/printing/print_settings.cc | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libcef/browser_request_context.cc b/libcef/browser_request_context.cc index 2d9b90192..150aaf0e8 100644 --- a/libcef/browser_request_context.cc +++ b/libcef/browser_request_context.cc @@ -37,12 +37,15 @@ #include "webkit/glue/webkit_glue.h" #if defined(OS_WIN) - #include #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)), diff --git a/libcef/printing/print_settings.cc b/libcef/printing/print_settings.cc index eddd64151..f8865f7fd 100644 --- a/libcef/printing/print_settings.cc +++ b/libcef/printing/print_settings.cc @@ -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),