| 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/bind.h" | 7 #include "base/bind.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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 // this is superfluous as gtk_init() ought to do this. It's | 532 // this is superfluous as gtk_init() ought to do this. It's |
| 533 // definitely harmless, so retained as a reminder of this | 533 // definitely harmless, so retained as a reminder of this |
| 534 // requirement for gconf. | 534 // requirement for gconf. |
| 535 g_type_init(); | 535 g_type_init(); |
| 536 | 536 |
| 537 #if defined(USE_AURA) | 537 #if defined(USE_AURA) |
| 538 setlocale(LC_ALL, ""); | 538 setlocale(LC_ALL, ""); |
| 539 #endif | 539 #endif |
| 540 | 540 |
| 541 #if !defined(USE_AURA) | 541 #if !defined(USE_AURA) |
| 542 gfx::GtkInitFromCommandLine(parameters_.command_line); | 542 gfx::GtkInitFromCommandLine(parsed_command_line_); |
| 543 #endif | 543 #endif |
| 544 | 544 |
| 545 SetUpGLibLogHandler(); | 545 SetUpGLibLogHandler(); |
| 546 #endif | 546 #endif |
| 547 | 547 |
| 548 #if defined(TOOLKIT_GTK) | 548 #if defined(TOOLKIT_GTK) |
| 549 // It is important for this to happen before the first run dialog, as it | 549 // It is important for this to happen before the first run dialog, as it |
| 550 // styles the dialog as well. | 550 // styles the dialog as well. |
| 551 gfx::InitRCStyles(); | 551 gfx::InitRCStyles(); |
| 552 #endif | 552 #endif |
| (...skipping 16 matching lines...) Expand all Loading... |
| 569 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task); | 569 MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task); |
| 570 | 570 |
| 571 #if defined(OS_MACOSX) | 571 #if defined(OS_MACOSX) |
| 572 MessageLoopForUI::current()->Run(); | 572 MessageLoopForUI::current()->Run(); |
| 573 #else | 573 #else |
| 574 MessageLoopForUI::current()->RunWithDispatcher(NULL); | 574 MessageLoopForUI::current()->RunWithDispatcher(NULL); |
| 575 #endif | 575 #endif |
| 576 } | 576 } |
| 577 | 577 |
| 578 } // namespace content | 578 } // namespace content |
| OLD | NEW |