Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1759)

Unified Diff: base/message_pump_mac.mm

Issue 11635050: Fix iOS build for XCode 4.6. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: nits Created 7 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/net/connection_tester.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/message_pump_mac.mm
diff --git a/base/message_pump_mac.mm b/base/message_pump_mac.mm
index 3878eb8a7d98392337b5b918cbce391d2300d658..4a07cd47df708188f656e31fc814f51443845aca 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;
Robert Sesek 2013/01/08 18:24:55 I think we deliberately like this as crapp ;). In
justincohen 2013/01/08 18:27:25 crapp: Heh, I do as I'm told! The newer clang com
+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
}
« no previous file with comments | « no previous file | chrome/browser/net/connection_tester.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698