Chromium Code Reviews| 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" |
| 11 #include "base/debug/debugger.h" | 11 #include "base/debug/debugger.h" |
| 12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
| 13 #include "base/mac/bundle_locations.h" | 13 #include "base/mac/bundle_locations.h" |
| 14 #include "base/mac/mac_util.h" | 14 #include "base/mac/mac_util.h" |
| 15 #include "base/memory/scoped_nsobject.h" | 15 #include "base/memory/scoped_nsobject.h" |
| 16 #include "base/metrics/histogram.h" | 16 #include "base/metrics/histogram.h" |
| 17 #include "base/path_service.h" | 17 #include "base/path_service.h" |
| 18 #include "chrome/app/breakpad_mac.h" | 18 #include "chrome/app/breakpad_mac.h" |
| 19 #import "chrome/browser/app_controller_mac.h" | 19 #import "chrome/browser/app_controller_mac.h" |
| 20 #import "chrome/browser/chrome_browser_application_mac.h" | 20 #import "chrome/browser/chrome_browser_application_mac.h" |
| 21 #include "chrome/browser/mac/install_from_dmg.h" | 21 #include "chrome/browser/mac/install_from_dmg.h" |
| 22 #include "chrome/browser/mac/keychain_reauthorize.h" | 22 #include "chrome/browser/mac/keychain_reauthorize.h" |
| 23 #import "chrome/browser/mac/keystone_glue.h" | 23 #import "chrome/browser/mac/keystone_glue.h" |
| 24 #include "chrome/browser/metrics/metrics_service.h" | 24 #include "chrome/browser/metrics/metrics_service.h" |
| 25 #include "chrome/browser/storage_monitor/image_capture_device_manager.h" | 25 #include "chrome/browser/storage_monitor/image_capture_device_manager.h" |
| 26 #include "chrome/browser/storage_monitor/removable_device_notifications_mac.h" | 26 #include "chrome/browser/storage_monitor/storage_monitor_mac.h" |
| 27 #include "chrome/common/chrome_paths.h" | 27 #include "chrome/common/chrome_paths.h" |
| 28 #include "chrome/common/chrome_switches.h" | 28 #include "chrome/common/chrome_switches.h" |
| 29 #include "content/public/common/main_function_params.h" | 29 #include "content/public/common/main_function_params.h" |
| 30 #include "content/public/common/result_codes.h" | 30 #include "content/public/common/result_codes.h" |
| 31 #include "ui/base/l10n/l10n_util_mac.h" | 31 #include "ui/base/l10n/l10n_util_mac.h" |
| 32 #include "ui/base/resource/resource_bundle.h" | 32 #include "ui/base/resource/resource_bundle.h" |
| 33 #include "ui/base/resource/resource_handle.h" | 33 #include "ui/base/resource/resource_handle.h" |
| 34 | 34 |
| 35 namespace { | 35 namespace { |
| 36 | 36 |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 275 // Make sure the app controller has been created. | 275 // Make sure the app controller has been created. |
| 276 DCHECK([NSApp delegate]); | 276 DCHECK([NSApp delegate]); |
| 277 | 277 |
| 278 // Prevent Cocoa from turning command-line arguments into | 278 // Prevent Cocoa from turning command-line arguments into |
| 279 // |-application:openFiles:|, since we already handle them directly. | 279 // |-application:openFiles:|, since we already handle them directly. |
| 280 [[NSUserDefaults standardUserDefaults] | 280 [[NSUserDefaults standardUserDefaults] |
| 281 setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; | 281 setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; |
| 282 } | 282 } |
| 283 | 283 |
| 284 void ChromeBrowserMainPartsMac::PreProfileInit() { | 284 void ChromeBrowserMainPartsMac::PreProfileInit() { |
| 285 removable_device_notifications_mac_ = | 285 storage_monitor_mac_ = |
| 286 new chrome::RemovableDeviceNotificationsMac(); | 286 new chrome::StorageMonitorMac(); |
|
vandebo (ex-Chrome)
2013/03/01 19:47:39
nit: line wrap
| |
| 287 // TODO(gbillock): Make the ImageCapture manager owned by | 287 // TODO(gbillock): Make the ImageCapture manager owned by |
| 288 // RemovableDeviceNotificationsMac. | 288 // StorageMonitorMac. |
| 289 if (base::mac::IsOSLionOrLater()) { | 289 if (base::mac::IsOSLionOrLater()) { |
| 290 image_capture_device_manager_.reset(new chrome::ImageCaptureDeviceManager); | 290 image_capture_device_manager_.reset(new chrome::ImageCaptureDeviceManager); |
| 291 image_capture_device_manager_->SetNotifications( | 291 image_capture_device_manager_->SetNotifications( |
| 292 removable_device_notifications_mac_->receiver()); | 292 storage_monitor_mac_->receiver()); |
| 293 } | 293 } |
| 294 | 294 |
| 295 ChromeBrowserMainPartsPosix::PreProfileInit(); | 295 ChromeBrowserMainPartsPosix::PreProfileInit(); |
| 296 } | 296 } |
| 297 | 297 |
| 298 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { | 298 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { |
| 299 AppController* appController = [NSApp delegate]; | 299 AppController* appController = [NSApp delegate]; |
| 300 [appController didEndMainMessageLoop]; | 300 [appController didEndMainMessageLoop]; |
| 301 } | 301 } |
| OLD | NEW |