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

Side by Side Diff: chrome/browser/chrome_browser_main_mac.mm

Issue 16703025: [StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 6 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 unified diff | Download patch
OLDNEW
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/storage_monitor_mac.h"
26 #include "chrome/common/chrome_paths.h" 25 #include "chrome/common/chrome_paths.h"
27 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
28 #include "content/public/common/main_function_params.h" 27 #include "content/public/common/main_function_params.h"
29 #include "content/public/common/result_codes.h" 28 #include "content/public/common/result_codes.h"
30 #include "ui/base/l10n/l10n_util_mac.h" 29 #include "ui/base/l10n/l10n_util_mac.h"
31 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
32 #include "ui/base/resource/resource_handle.h" 31 #include "ui/base/resource/resource_handle.h"
33 32
34 namespace { 33 namespace {
35 34
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 [nib instantiateNibWithOwner:NSApp topLevelObjects:nil]; 272 [nib instantiateNibWithOwner:NSApp topLevelObjects:nil];
274 // Make sure the app controller has been created. 273 // Make sure the app controller has been created.
275 DCHECK([NSApp delegate]); 274 DCHECK([NSApp delegate]);
276 275
277 // Prevent Cocoa from turning command-line arguments into 276 // Prevent Cocoa from turning command-line arguments into
278 // |-application:openFiles:|, since we already handle them directly. 277 // |-application:openFiles:|, since we already handle them directly.
279 [[NSUserDefaults standardUserDefaults] 278 [[NSUserDefaults standardUserDefaults]
280 setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"]; 279 setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
281 } 280 }
282 281
283 void ChromeBrowserMainPartsMac::PreProfileInit() {
284 storage_monitor_.reset(new chrome::StorageMonitorMac());
285
286 ChromeBrowserMainPartsPosix::PreProfileInit();
287 }
288
289 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { 282 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
290 AppController* appController = [NSApp delegate]; 283 AppController* appController = [NSApp delegate];
291 [appController didEndMainMessageLoop]; 284 [appController didEndMainMessageLoop];
292 } 285 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698