OLD | NEW |
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" |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
306 SetUpGLibLogHandler(); | 306 SetUpGLibLogHandler(); |
307 #endif | 307 #endif |
308 | 308 |
309 #if defined(TOOLKIT_GTK) | 309 #if defined(TOOLKIT_GTK) |
310 // It is important for this to happen before the first run dialog, as it | 310 // It is important for this to happen before the first run dialog, as it |
311 // styles the dialog as well. | 311 // styles the dialog as well. |
312 gfx::InitRCStyles(); | 312 gfx::InitRCStyles(); |
313 #endif | 313 #endif |
314 | 314 |
315 #if defined(OS_WIN) | 315 #if defined(OS_WIN) |
| 316 // Init common control sex. |
316 INITCOMMONCONTROLSEX config; | 317 INITCOMMONCONTROLSEX config; |
317 config.dwSize = sizeof(config); | 318 config.dwSize = sizeof(config); |
318 config.dwICC = ICC_WIN95_CLASSES; | 319 config.dwICC = ICC_WIN95_CLASSES; |
319 if (!InitCommonControlsEx(&config)) | 320 if (!InitCommonControlsEx(&config)) |
320 LOG_GETLASTERROR(FATAL); | 321 LOG_GETLASTERROR(FATAL); |
321 #endif | 322 #endif |
322 | 323 |
323 ToolkitInitialized(); | 324 ToolkitInitialized(); |
324 } | 325 } |
325 | 326 |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
415 base::win::ScopedCOMInitializer com_initializer; | 416 base::win::ScopedCOMInitializer com_initializer; |
416 #endif // OS_WIN | 417 #endif // OS_WIN |
417 | 418 |
418 base::StatisticsRecorder statistics; | 419 base::StatisticsRecorder statistics; |
419 | 420 |
420 parts->RunMainMessageLoopParts(); | 421 parts->RunMainMessageLoopParts(); |
421 | 422 |
422 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 423 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
423 return parts->result_code(); | 424 return parts->result_code(); |
424 } | 425 } |
OLD | NEW |