| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chrome_browser_main_mac.h" | 5 #include "chrome/browser/chrome_browser_main_mac.h" |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/debugger.h" | 10 #include "base/debug/debugger.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 // This is a no-op if the KeystoneRegistration framework is not present. | 107 // This is a no-op if the KeystoneRegistration framework is not present. |
| 108 // The framework is only distributed with branded Google Chrome builds. | 108 // The framework is only distributed with branded Google Chrome builds. |
| 109 [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone]; | 109 [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone]; |
| 110 | 110 |
| 111 // Prevent Cocoa from turning command-line arguments into | 111 // Prevent Cocoa from turning command-line arguments into |
| 112 // |-application:openFiles:|, since we already handle them directly. | 112 // |-application:openFiles:|, since we already handle them directly. |
| 113 [[NSUserDefaults standardUserDefaults] | 113 [[NSUserDefaults standardUserDefaults] |
| 114 setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; | 114 setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; |
| 115 } | 115 } |
| 116 | 116 |
| 117 void ChromeBrowserMainPartsMac::ShowMissingLocaleMessageBox() { | |
| 118 // Not called on Mac because we load the locale files differently. | |
| 119 NOTREACHED(); | |
| 120 } | |
| 121 | |
| 122 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { | 117 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { |
| 123 AppController* appController = [NSApp delegate]; | 118 AppController* appController = [NSApp delegate]; |
| 124 [appController didEndMainMessageLoop]; | 119 [appController didEndMainMessageLoop]; |
| 125 } | 120 } |
| OLD | NEW |