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

Side by Side Diff: content/browser/browser_main.cc

Issue 8340028: Salient parts of http://codereview.chromium.org/8392042/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « content/browser/browser_child_process_host.cc ('k') | content/browser/browser_main_loop.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/browser/browser_main.h" 5 #include "content/browser/browser_main.h"
6 6
7 #include "base/allocator/allocator_shim.h" 7 #include "base/allocator/allocator_shim.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "content/browser/browser_main_loop.h" 12 #include "content/browser/browser_main_loop.h"
13 #include "content/browser/browser_thread.h"
14 #include "content/browser/notification_service_impl.h" 13 #include "content/browser/notification_service_impl.h"
15 #include "content/common/main_function_params.h" 14 #include "content/common/main_function_params.h"
16 #include "content/public/common/content_switches.h" 15 #include "content/public/common/content_switches.h"
17 16
18 #if defined(OS_WIN) 17 #if defined(OS_WIN)
19 #include "base/win/scoped_com_initializer.h" 18 #include "base/win/scoped_com_initializer.h"
20 #include "content/common/sandbox_policy.h" 19 #include "content/common/sandbox_policy.h"
21 #include "sandbox/src/sandbox.h" 20 #include "sandbox/src/sandbox.h"
22 #endif 21 #endif
23 22
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 #endif // OS_WIN 116 #endif // OS_WIN
118 117
119 base::StatisticsRecorder statistics; 118 base::StatisticsRecorder statistics;
120 119
121 main_loop->RunMainMessageLoopParts(&g_exited_main_message_loop); 120 main_loop->RunMainMessageLoopParts(&g_exited_main_message_loop);
122 121
123 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 122 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
124 123
125 return main_loop->GetResultCode(); 124 return main_loop->GetResultCode();
126 } 125 }
OLDNEW
« no previous file with comments | « content/browser/browser_child_process_host.cc ('k') | content/browser/browser_main_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698