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

Unified Diff: chrome/browser/browser_main_mac.mm

Issue 345051: Cleans up our autorelease handling so that we don't create a layered ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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
Index: chrome/browser/browser_main_mac.mm
===================================================================
--- chrome/browser/browser_main_mac.mm (revision 31104)
+++ chrome/browser/browser_main_mac.mm (working copy)
@@ -13,7 +13,7 @@
#import "chrome/app/keystone_glue.h"
#import "chrome/browser/app_controller_mac.h"
#include "chrome/browser/browser_main_win.h"
-#import "chrome/browser/chrome_application_mac.h"
+#import "chrome/browser/chrome_browser_application_mac.h"
#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/common/main_function_params.h"
#include "chrome/common/result_codes.h"
@@ -28,15 +28,8 @@
// MessageLoop API, which works out ok for us because it's a wrapper around
// CFRunLoop.
void WillInitializeMainMessageLoop(const MainFunctionParams& parameters) {
- // Initialize NSApplication using the custom subclass. Check whether NSApp
- // was already initialized using another class, because that would break
- // some things.
- [CrApplication sharedApplication];
- if (![NSApp isKindOfClass:[CrApplication class]]) {
- LOG(ERROR) << "NSApp should be of type CrApplication, not "
- << [[NSApp className] UTF8String];
- DCHECK(false) << "NSApp is of wrong type";
- }
+ // Initialize NSApplication using the custom subclass.
+ [BrowserCrApplication sharedApplication];
// Before we load the nib, we need to start up the resource bundle so we have
// the strings avaiable for localization.

Powered by Google App Engine
This is Rietveld 408576698