OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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" |
11 #include "base/file_path.h" | 11 #include "base/file_path.h" |
12 #include "base/mac/mac_util.h" | 12 #include "base/mac/mac_util.h" |
13 #include "base/memory/scoped_nsobject.h" | 13 #include "base/memory/scoped_nsobject.h" |
14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
15 #include "chrome/app/breakpad_mac.h" | 15 #include "chrome/app/breakpad_mac.h" |
16 #import "chrome/browser/app_controller_mac.h" | 16 #import "chrome/browser/app_controller_mac.h" |
17 #import "chrome/browser/chrome_browser_application_mac.h" | 17 #import "chrome/browser/chrome_browser_application_mac.h" |
18 #import "chrome/browser/mac/keystone_glue.h" | 18 #import "chrome/browser/mac/keystone_glue.h" |
19 #include "chrome/browser/metrics/metrics_service.h" | 19 #include "chrome/browser/metrics/metrics_service.h" |
20 #include "chrome/common/chrome_paths.h" | 20 #include "chrome/common/chrome_paths.h" |
21 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
22 #include "content/common/main_function_params.h" | 22 #include "content/common/main_function_params.h" |
23 #include "content/common/result_codes.h" | 23 #include "content/common/result_codes.h" |
24 #include "ui/base/l10n/l10n_util_mac.h" | 24 #include "ui/base/l10n/l10n_util_mac.h" |
25 #include "ui/base/resource/resource_bundle.h" | 25 #include "ui/base/resource/resource_bundle.h" |
26 | 26 |
27 namespace content { | |
28 | |
29 void DidEndMainMessageLoop() { | |
30 AppController* appController = [NSApp delegate]; | |
31 [appController didEndMainMessageLoop]; | |
32 } | |
33 | |
34 } | |
35 | |
36 void RecordBreakpadStatusUMA(MetricsService* metrics) { | 27 void RecordBreakpadStatusUMA(MetricsService* metrics) { |
37 metrics->RecordBreakpadRegistration(IsCrashReporterEnabled()); | 28 metrics->RecordBreakpadRegistration(IsCrashReporterEnabled()); |
38 metrics->RecordBreakpadHasDebugger(base::debug::BeingDebugged()); | 29 metrics->RecordBreakpadHasDebugger(base::debug::BeingDebugged()); |
39 } | 30 } |
40 | 31 |
41 void RecordBrowserStartupTime() { | 32 void RecordBrowserStartupTime() { |
42 // Not implemented on Mac for now. | 33 // Not implemented on Mac for now. |
43 } | 34 } |
44 | 35 |
45 void WarnAboutMinimumSystemRequirements() { | 36 void WarnAboutMinimumSystemRequirements() { |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 | 120 |
130 // This is a no-op if the KeystoneRegistration framework is not present. | 121 // This is a no-op if the KeystoneRegistration framework is not present. |
131 // The framework is only distributed with branded Google Chrome builds. | 122 // The framework is only distributed with branded Google Chrome builds. |
132 [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone]; | 123 [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone]; |
133 | 124 |
134 // Prevent Cocoa from turning command-line arguments into | 125 // Prevent Cocoa from turning command-line arguments into |
135 // |-application:openFiles:|, since we already handle them directly. | 126 // |-application:openFiles:|, since we already handle them directly. |
136 [[NSUserDefaults standardUserDefaults] | 127 [[NSUserDefaults standardUserDefaults] |
137 setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; | 128 setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; |
138 } | 129 } |
| 130 |
| 131 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { |
| 132 AppController* appController = [NSApp delegate]; |
| 133 [appController didEndMainMessageLoop]; |
| 134 } |
OLD | NEW |