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

Unified Diff: content/common/chrome_application_mac.mm

Issue 8763017: [Mac] Move MessagePump CrAppProtocol dependency to setup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sigh, minimal content/ change, just to see. Created 9 years, 1 month 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 | « chrome/browser/tab_contents/tab_contents_view_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/chrome_application_mac.mm
diff --git a/content/common/chrome_application_mac.mm b/content/common/chrome_application_mac.mm
index 81b341c62568f12ebd388f0324381d43e9f5af9f..5af70e9f48e45dbe7b511ab6dc0e0ff27b2fd6bf 100644
--- a/content/common/chrome_application_mac.mm
+++ b/content/common/chrome_application_mac.mm
@@ -16,10 +16,12 @@
// some things.
+ (NSApplication*)sharedApplication {
NSApplication* app = [super sharedApplication];
- if (![NSApp isKindOfClass:self]) {
- DLOG(ERROR) << "NSApp should be of type " << [[self className] UTF8String]
- << ", not " << [[NSApp className] UTF8String];
- DCHECK(false) << "NSApp is of wrong type";
+ if (![app conformsToProtocol:@protocol(CrAppControlProtocol)]) {
+ // TODO(shess): This is necessary until all of the references to
+ // CrApplication are removed.
+ DLOG(ERROR) << "Existing NSApp (class " << [[app className] UTF8String]
+ << ") does not conform to required protocol.";
+ NOTREACHED();
}
return app;
}
« no previous file with comments | « chrome/browser/tab_contents/tab_contents_view_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698