| 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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 // used in net/proxy/proxy_config_service_linux.cc. Most likely | 284 // used in net/proxy/proxy_config_service_linux.cc. Most likely |
| 285 // this is superfluous as gtk_init() ought to do this. It's | 285 // this is superfluous as gtk_init() ought to do this. It's |
| 286 // definitely harmless, so retained as a reminder of this | 286 // definitely harmless, so retained as a reminder of this |
| 287 // requirement for gconf. | 287 // requirement for gconf. |
| 288 g_type_init(); | 288 g_type_init(); |
| 289 #if defined(OS_CHROMEOS) | 289 #if defined(OS_CHROMEOS) |
| 290 // ChromeOS still uses dbus-glib, so initialize its threading here. | 290 // ChromeOS still uses dbus-glib, so initialize its threading here. |
| 291 // TODO(satorux, stevenjb): remove this once it is no longer needed. | 291 // TODO(satorux, stevenjb): remove this once it is no longer needed. |
| 292 dbus_g_thread_init(); | 292 dbus_g_thread_init(); |
| 293 #endif | 293 #endif |
| 294 #if !defined(USE_AURA) |
| 294 gfx::GtkInitFromCommandLine(parameters().command_line_); | 295 gfx::GtkInitFromCommandLine(parameters().command_line_); |
| 296 #endif |
| 295 SetUpGLibLogHandler(); | 297 SetUpGLibLogHandler(); |
| 296 #endif | 298 #endif |
| 297 | 299 |
| 298 #if defined(TOOLKIT_GTK) | 300 #if defined(TOOLKIT_GTK) |
| 299 // It is important for this to happen before the first run dialog, as it | 301 // It is important for this to happen before the first run dialog, as it |
| 300 // styles the dialog as well. | 302 // styles the dialog as well. |
| 301 gfx::InitRCStyles(); | 303 gfx::InitRCStyles(); |
| 302 #endif | 304 #endif |
| 303 | 305 |
| 304 #if defined(OS_WIN) | 306 #if defined(OS_WIN) |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 base::win::ScopedCOMInitializer com_initializer; | 406 base::win::ScopedCOMInitializer com_initializer; |
| 405 #endif // OS_WIN | 407 #endif // OS_WIN |
| 406 | 408 |
| 407 base::StatisticsRecorder statistics; | 409 base::StatisticsRecorder statistics; |
| 408 | 410 |
| 409 parts->RunMainMessageLoopParts(); | 411 parts->RunMainMessageLoopParts(); |
| 410 | 412 |
| 411 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 413 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
| 412 return parts->result_code(); | 414 return parts->result_code(); |
| 413 } | 415 } |
| OLD | NEW |