diff options
| -rw-r--r-- | base/message_pump_mac.mm | 8 | ||||
| -rw-r--r-- | chrome/browser/net/connection_tester.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/net/proxy_service_factory.cc | 2 | ||||
| -rw-r--r-- | chrome/common/mac/objc_zombie.mm | 5 |
4 files changed, 16 insertions, 7 deletions
diff --git a/base/message_pump_mac.mm b/base/message_pump_mac.mm index 3878eb8..4a07cd4 100644 --- a/base/message_pump_mac.mm +++ b/base/message_pump_mac.mm @@ -24,9 +24,11 @@ void NoOp(void* info) { const CFTimeInterval kCFTimeIntervalMax = std::numeric_limits<CFTimeInterval>::max(); +#if !defined(OS_IOS) // Set to true if MessagePumpMac::Create() is called before NSApp is // initialized. Only accessed from the main thread. -bool not_using_crapp = false; +bool g_not_using_cr_app = false; +#endif } // namespace @@ -660,7 +662,7 @@ bool MessagePumpMac::UsingCrApp() { DCHECK(NSApp); // The pump was created using MessagePumpNSApplication. - if (not_using_crapp) + if (g_not_using_cr_app) return false; return [NSApp conformsToProtocol:@protocol(CrAppProtocol)]; @@ -688,7 +690,7 @@ MessagePump* MessagePumpMac::Create() { // NSApplication subclass should initialize appropriately before // creating an event loop. [NSApplication sharedApplication]; - not_using_crapp = true; + g_not_using_cr_app = true; return new MessagePumpNSApplication; #endif } diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 2f9ecab..f5e892b 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -50,8 +50,10 @@ namespace { class ExperimentURLRequestContext : public net::URLRequestContext { public: explicit ExperimentURLRequestContext( - net::URLRequestContext* proxy_request_context) - : proxy_request_context_(proxy_request_context), + net::URLRequestContext* proxy_request_context) : +#if !defined(OS_IOS) + proxy_request_context_(proxy_request_context), +#endif ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)), ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {} @@ -286,7 +288,9 @@ class ExperimentURLRequestContext : public net::URLRequestContext { #endif } +#if !defined(OS_IOS) net::URLRequestContext* const proxy_request_context_; +#endif net::URLRequestContextStorage storage_; base::WeakPtrFactory<ExperimentURLRequestContext> weak_factory_; }; diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc index 2cdd496..06046a7 100644 --- a/chrome/browser/net/proxy_service_factory.cc +++ b/chrome/browser/net/proxy_service_factory.cc @@ -106,7 +106,7 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService( } } - net::ProxyService* proxy_service; + net::ProxyService* proxy_service = NULL; if (use_v8) { #if defined(OS_IOS) NOTREACHED(); diff --git a/chrome/common/mac/objc_zombie.mm b/chrome/common/mac/objc_zombie.mm index a0cd90e..b7cf512 100644 --- a/chrome/common/mac/objc_zombie.mm +++ b/chrome/common/mac/objc_zombie.mm @@ -35,7 +35,10 @@ OBJC_EXPORT void *objc_destructInstance(id obj); // The version of clang that ships with Xcode 4.5 does not include this // warning, so it is disabled on iOS. This may change in future Xcode // releases. -#if !defined(OS_IOS) +// TODO(justincohen): This is fixed in clang 4.2 in XCode 4.6. Remove this +// once everyone is moved to XCode 4.6 b/7882496. +#if !defined(OS_IOS) || \ + (__clang_major__ > 4 || (__clang_major__ == 4 && __clang_minor__ >= 2)) __attribute__((objc_root_class)) #endif @interface CrZombie { |