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

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

Issue 585123004: Mac: Give app_shim code a nicer home (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: various cleanups Created 6 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 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 "apps/app_shim/app_shim_host_manager_mac.h"
11 #include "base/command_line.h" 10 #include "base/command_line.h"
12 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
13 #include "base/mac/bundle_locations.h" 12 #include "base/mac/bundle_locations.h"
14 #include "base/mac/mac_util.h" 13 #include "base/mac/mac_util.h"
15 #include "base/mac/scoped_nsobject.h" 14 #include "base/mac/scoped_nsobject.h"
16 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
17 #include "base/path_service.h" 16 #include "base/path_service.h"
18 #import "chrome/browser/app_controller_mac.h" 17 #import "chrome/browser/app_controller_mac.h"
18 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h"
19 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.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 #import "chrome/browser/mac/keystone_glue.h" 22 #import "chrome/browser/mac/keystone_glue.h"
23 #include "chrome/browser/mac/mac_startup_profiler.h" 23 #include "chrome/browser/mac/mac_startup_profiler.h"
24 #include "chrome/browser/ui/app_list/app_list_service.h" 24 #include "chrome/browser/ui/app_list/app_list_service.h"
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 "components/crash/app/breakpad_mac.h" 27 #include "components/crash/app/breakpad_mac.h"
28 #include "components/metrics/metrics_service.h" 28 #include "components/metrics/metrics_service.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 MacStartupProfiler::POST_PROFILE_INIT); 282 MacStartupProfiler::POST_PROFILE_INIT);
283 ChromeBrowserMainPartsPosix::PostProfileInit(); 283 ChromeBrowserMainPartsPosix::PostProfileInit();
284 g_browser_process->metrics_service()->RecordBreakpadRegistration( 284 g_browser_process->metrics_service()->RecordBreakpadRegistration(
285 breakpad::IsCrashReporterEnabled()); 285 breakpad::IsCrashReporterEnabled());
286 } 286 }
287 287
288 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { 288 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
289 AppController* appController = [NSApp delegate]; 289 AppController* appController = [NSApp delegate];
290 [appController didEndMainMessageLoop]; 290 [appController didEndMainMessageLoop];
291 } 291 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_platform_part_mac.h ('k') | chrome/browser/ui/app_list/app_list_service_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698