| 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_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 // TODO(stevenjb): Move platform specific code into platform specific Parts | 516 // TODO(stevenjb): Move platform specific code into platform specific Parts |
| 517 // (Need to add InitializeToolkit stage to BrowserParts). | 517 // (Need to add InitializeToolkit stage to BrowserParts). |
| 518 #if defined(OS_LINUX) || defined(OS_OPENBSD) | 518 #if defined(OS_LINUX) || defined(OS_OPENBSD) |
| 519 // Glib type system initialization. Needed at least for gconf, | 519 // Glib type system initialization. Needed at least for gconf, |
| 520 // used in net/proxy/proxy_config_service_linux.cc. Most likely | 520 // used in net/proxy/proxy_config_service_linux.cc. Most likely |
| 521 // this is superfluous as gtk_init() ought to do this. It's | 521 // this is superfluous as gtk_init() ought to do this. It's |
| 522 // definitely harmless, so retained as a reminder of this | 522 // definitely harmless, so retained as a reminder of this |
| 523 // requirement for gconf. | 523 // requirement for gconf. |
| 524 g_type_init(); | 524 g_type_init(); |
| 525 | 525 |
| 526 #if defined(USE_AURA) |
| 527 setlocale(LC_ALL, ""); |
| 528 #endif |
| 529 |
| 526 #if !defined(USE_AURA) | 530 #if !defined(USE_AURA) |
| 527 gfx::GtkInitFromCommandLine(parameters_.command_line); | 531 gfx::GtkInitFromCommandLine(parameters_.command_line); |
| 528 #endif | 532 #endif |
| 529 | 533 |
| 530 SetUpGLibLogHandler(); | 534 SetUpGLibLogHandler(); |
| 531 #endif | 535 #endif |
| 532 | 536 |
| 533 #if defined(TOOLKIT_GTK) | 537 #if defined(TOOLKIT_GTK) |
| 534 // It is important for this to happen before the first run dialog, as it | 538 // It is important for this to happen before the first run dialog, as it |
| 535 // styles the dialog as well. | 539 // styles the dialog as well. |
| (...skipping 18 matching lines...) Expand all Loading... |
| 554 MessageLoopForUI::current()->PostTask(FROM_HERE, parameters_.ui_task); | 558 MessageLoopForUI::current()->PostTask(FROM_HERE, parameters_.ui_task); |
| 555 | 559 |
| 556 #if defined(OS_MACOSX) | 560 #if defined(OS_MACOSX) |
| 557 MessageLoopForUI::current()->Run(); | 561 MessageLoopForUI::current()->Run(); |
| 558 #else | 562 #else |
| 559 MessageLoopForUI::current()->RunWithDispatcher(NULL); | 563 MessageLoopForUI::current()->RunWithDispatcher(NULL); |
| 560 #endif | 564 #endif |
| 561 } | 565 } |
| 562 | 566 |
| 563 } // namespace content | 567 } // namespace content |
| OLD | NEW |