| 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 #include <sys/sysctl.h> | 8 #include <sys/sysctl.h> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "chrome/common/chrome_paths.h" | 25 #include "chrome/common/chrome_paths.h" |
| 26 #include "chrome/common/chrome_switches.h" | 26 #include "chrome/common/chrome_switches.h" |
| 27 #include "content/public/common/main_function_params.h" | 27 #include "content/public/common/main_function_params.h" |
| 28 #include "content/public/common/result_codes.h" | 28 #include "content/public/common/result_codes.h" |
| 29 #include "ui/base/l10n/l10n_util_mac.h" | 29 #include "ui/base/l10n/l10n_util_mac.h" |
| 30 #include "ui/base/resource/resource_bundle.h" | 30 #include "ui/base/resource/resource_bundle.h" |
| 31 #include "ui/base/resource/resource_handle.h" | 31 #include "ui/base/resource/resource_handle.h" |
| 32 | 32 |
| 33 namespace { | 33 namespace { |
| 34 | 34 |
| 35 // This preference is used to track whether the KeychainReauthorize operation | |
| 36 // has occurred at launch. This operation only makes sense while the | |
| 37 // application continues to be signed by the old certificate. | |
| 38 NSString* const kKeychainReauthorizeAtLaunchPref = | |
| 39 @"KeychainReauthorizeInAppMay2012"; | |
| 40 const int kKeychainReauthorizeAtLaunchMaxTries = 2; | |
| 41 | |
| 42 // Some users rarely restart Chrome, so they might never get a chance to run | 35 // Some users rarely restart Chrome, so they might never get a chance to run |
| 43 // the at-launch KeychainReauthorize. To account for them, there's also an | 36 // the at-launch KeychainReauthorize. To account for them, there's also an |
| 44 // at-update KeychainReauthorize option, which runs from .keystone_install for | 37 // at-update KeychainReauthorize option, which runs from .keystone_install for |
| 45 // users on a user Keystone ticket. This operation may make sense for a period | 38 // users on a user Keystone ticket. This operation may make sense for a period |
| 46 // of time after the application switches to being signed by the new | 39 // of time after the application switches to being signed by the new |
| 47 // certificate, as long as the at-update stub executable is still signed by | 40 // certificate, as long as the at-update stub executable is still signed by |
| 48 // the old one. | 41 // the old one. |
| 49 NSString* const kKeychainReauthorizeAtUpdatePref = | 42 NSString* const kKeychainReauthorizeAtUpdatePref = |
| 50 @"KeychainReauthorizeAtUpdateMay2012"; | 43 @"KeychainReauthorizeAtUpdateMay2012"; |
| 51 const int kKeychainReauthorizeAtUpdateMaxTries = 3; | 44 const int kKeychainReauthorizeAtUpdateMaxTries = 3; |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 void ChromeBrowserMainPartsMac::PostProfileInit() { | 260 void ChromeBrowserMainPartsMac::PostProfileInit() { |
| 268 ChromeBrowserMainPartsPosix::PostProfileInit(); | 261 ChromeBrowserMainPartsPosix::PostProfileInit(); |
| 269 g_browser_process->metrics_service()->RecordBreakpadRegistration( | 262 g_browser_process->metrics_service()->RecordBreakpadRegistration( |
| 270 IsCrashReporterEnabled()); | 263 IsCrashReporterEnabled()); |
| 271 } | 264 } |
| 272 | 265 |
| 273 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { | 266 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { |
| 274 AppController* appController = [NSApp delegate]; | 267 AppController* appController = [NSApp delegate]; |
| 275 [appController didEndMainMessageLoop]; | 268 [appController didEndMainMessageLoop]; |
| 276 } | 269 } |
| OLD | NEW |