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

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

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/browser_shutdown.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser_main_posix.h" 5 #include "chrome/browser/browser_main_posix.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "app/app_switches.h" 9 #include "app/app_switches.h"
10 #include "app/l10n_util_mac.h" 10 #include "app/l10n_util_mac.h"
11 #include "app/resource_bundle.h"
12 #include "base/command_line.h" 11 #include "base/command_line.h"
13 #include "base/debug/debugger.h" 12 #include "base/debug/debugger.h"
14 #include "base/file_path.h" 13 #include "base/file_path.h"
15 #include "base/mac/mac_util.h" 14 #include "base/mac/mac_util.h"
16 #include "base/nss_util.h" 15 #include "base/nss_util.h"
17 #include "base/path_service.h" 16 #include "base/path_service.h"
18 #include "base/scoped_nsobject.h" 17 #include "base/scoped_nsobject.h"
19 #include "chrome/app/breakpad_mac.h" 18 #include "chrome/app/breakpad_mac.h"
20 #import "chrome/browser/app_controller_mac.h" 19 #import "chrome/browser/app_controller_mac.h"
21 #include "chrome/browser/browser_main_win.h" 20 #include "chrome/browser/browser_main_win.h"
22 #import "chrome/browser/chrome_browser_application_mac.h" 21 #import "chrome/browser/chrome_browser_application_mac.h"
23 #import "chrome/browser/ui/cocoa/keystone_glue.h" 22 #import "chrome/browser/ui/cocoa/keystone_glue.h"
24 #include "chrome/browser/metrics/metrics_service.h" 23 #include "chrome/browser/metrics/metrics_service.h"
25 #include "chrome/common/chrome_paths.h" 24 #include "chrome/common/chrome_paths.h"
26 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/main_function_params.h" 26 #include "chrome/common/main_function_params.h"
28 #include "chrome/common/result_codes.h" 27 #include "chrome/common/result_codes.h"
29 #include "net/socket/ssl_client_socket_mac_factory.h" 28 #include "net/socket/ssl_client_socket_mac_factory.h"
29 #include "ui/base/resource/resource_bundle.h"
30 30
31 void DidEndMainMessageLoop() { 31 void DidEndMainMessageLoop() {
32 AppController* appController = [NSApp delegate]; 32 AppController* appController = [NSApp delegate];
33 [appController didEndMainMessageLoop]; 33 [appController didEndMainMessageLoop];
34 } 34 }
35 35
36 void RecordBreakpadStatusUMA(MetricsService* metrics) { 36 void RecordBreakpadStatusUMA(MetricsService* metrics) {
37 metrics->RecordBreakpadRegistration(IsCrashReporterEnabled()); 37 metrics->RecordBreakpadRegistration(IsCrashReporterEnabled());
38 metrics->RecordBreakpadHasDebugger(base::debug::BeingDebugged()); 38 metrics->RecordBreakpadHasDebugger(base::debug::BeingDebugged());
39 } 39 }
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 base::EnsureNSPRInit(); 142 base::EnsureNSPRInit();
143 } 143 }
144 } 144 }
145 }; 145 };
146 146
147 // static 147 // static
148 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( 148 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
149 const MainFunctionParams& parameters) { 149 const MainFunctionParams& parameters) {
150 return new BrowserMainPartsMac(parameters); 150 return new BrowserMainPartsMac(parameters);
151 } 151 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/browser_shutdown.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698