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

Unified Diff: chrome/browser/chrome_browser_main_mac.mm

Issue 10919185: Implement RemovableDeviceNotifications for Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix threading Created 8 years, 3 months 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/chrome_browser_main_mac.mm
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index a9596638de7bf118d845c9d24bc3f1f8b3932247..1bd01a370bac24b7f683a26a39e9aa01a434c8af 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -20,6 +20,7 @@
#include "chrome/browser/mac/keychain_reauthorize.h"
#import "chrome/browser/mac/keystone_glue.h"
#include "chrome/browser/metrics/metrics_service.h"
+#include "chrome/browser/system_monitor/removable_device_notifications_mac.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "content/public/common/main_function_params.h"
@@ -72,6 +73,9 @@ ChromeBrowserMainPartsMac::ChromeBrowserMainPartsMac(
: ChromeBrowserMainPartsPosix(parameters) {
}
+ChromeBrowserMainPartsMac::~ChromeBrowserMainPartsMac() {
+}
+
void ChromeBrowserMainPartsMac::PreEarlyInitialization() {
if (parsed_command_line().HasSwitch(switches::kKeychainReauthorize)) {
if (base::mac::AmIBundled()) {
@@ -175,6 +179,12 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
}
+void ChromeBrowserMainPartsMac::PreProfileInit() {
+ removable_device_notifications_mac_.reset(
+ new chrome::RemovableDeviceNotificationsMac());
+ ChromeBrowserMainPartsPosix::PreProfileInit();
+}
+
void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
AppController* appController = [NSApp delegate];
[appController didEndMainMessageLoop];

Powered by Google App Engine
This is Rietveld 408576698