Fix iOS build for XCode 4.6.

base/message_pump_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "base/message_pump_mac.h"
 
 #import <Foundation/Foundation.h>
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/time.h"
 
 #if !defined(OS_IOS)
 #import <AppKit/AppKit.h>
 #endif  // !defined(OS_IOS)
 
 namespace {
 
 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;

[Robert Sesek, 2013/01/08 18:24:55]

I think we deliberately like this as crapp ;).

In fact is your base/ change even necessary since this variable is only
consulted for in methods that are already ifdefed?

[justincohen, 2013/01/08 18:27:25]

crapp: Heh, I do as I'm told!

The newer clang complains about the unused variable, that's why this is needed. 


On 2013/01/08 18:24:55, rsesek wrote:

+bool g_not_using_cr_app = false;
+#endif
 
 }  // namespace
 
 namespace base {
 
 // A scoper for autorelease pools created from message pump run loops.
 // Avoids dirtying up the ScopedNSAutoreleasePool interface for the rare
 // case where an autorelease pool needs to be passed in.
 class MessagePumpScopedAutoreleasePool {
  public:
@@ skipping 613 matching lines @@
 
 // static
 bool MessagePumpMac::UsingCrApp() {
   DCHECK([NSThread isMainThread]);
 
   // If NSApp is still not initialized, then the subclass used cannot
   // be determined.
   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)];
 }
 
 // static
 bool MessagePumpMac::IsHandlingSendEvent() {
   DCHECK([NSApp conformsToProtocol:@protocol(CrAppProtocol)]);
   NSObject<CrAppProtocol>* app = static_cast<NSObject<CrAppProtocol>*>(NSApp);
   return [app isHandlingSendEvent];
 }
 #endif  // !defined(OS_IOS)
 
 // static
 MessagePump* MessagePumpMac::Create() {
   if ([NSThread isMainThread]) {
 #if defined(OS_IOS)
     return new MessagePumpUIApplication;
 #else
     if ([NSApp conformsToProtocol:@protocol(CrAppProtocol)])
       return new MessagePumpCrApplication;
 
     // The main-thread MessagePump implementations REQUIRE an NSApp.
     // Executables which have specific requirements for their
     // 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
   }
 
   return new MessagePumpNSRunLoop;
 }
 
 }  // namespace base