OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 #if defined(USE_GLIB) | 91 #if defined(USE_GLIB) |
92 #include <glib-object.h> | 92 #include <glib-object.h> |
93 #endif | 93 #endif |
94 | 94 |
95 #if defined(OS_LINUX) && defined(USE_UDEV) | 95 #if defined(OS_LINUX) && defined(USE_UDEV) |
96 #include "content/browser/device_monitor_udev.h" | 96 #include "content/browser/device_monitor_udev.h" |
97 #elif defined(OS_MACOSX) && !defined(OS_IOS) | 97 #elif defined(OS_MACOSX) && !defined(OS_IOS) |
98 #include "content/browser/device_monitor_mac.h" | 98 #include "content/browser/device_monitor_mac.h" |
99 #endif | 99 #endif |
100 | 100 |
101 #if defined(TOOLKIT_GTK) | |
102 #include "ui/gfx/gtk_util.h" | |
103 #endif | |
104 | |
105 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 101 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
106 #include <sys/stat.h> | 102 #include <sys/stat.h> |
107 | 103 |
108 #include "content/browser/renderer_host/render_sandbox_host_linux.h" | 104 #include "content/browser/renderer_host/render_sandbox_host_linux.h" |
109 #include "content/browser/zygote_host/zygote_host_impl_linux.h" | 105 #include "content/browser/zygote_host/zygote_host_impl_linux.h" |
110 #endif | 106 #endif |
111 | 107 |
112 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) | 108 #if defined(TCMALLOC_TRACE_MEMORY_SUPPORTED) |
113 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" | 109 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" |
114 #endif | 110 #endif |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g
-type-init | 373 // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g
-type-init |
378 #if !GLIB_CHECK_VERSION(2, 35, 0) | 374 #if !GLIB_CHECK_VERSION(2, 35, 0) |
379 // GLib type system initialization. Needed at least for gconf, | 375 // GLib type system initialization. Needed at least for gconf, |
380 // used in net/proxy/proxy_config_service_linux.cc. Most likely | 376 // used in net/proxy/proxy_config_service_linux.cc. Most likely |
381 // this is superfluous as gtk_init() ought to do this. It's | 377 // this is superfluous as gtk_init() ought to do this. It's |
382 // definitely harmless, so retained as a reminder of this | 378 // definitely harmless, so retained as a reminder of this |
383 // requirement for gconf. | 379 // requirement for gconf. |
384 g_type_init(); | 380 g_type_init(); |
385 #endif | 381 #endif |
386 | 382 |
387 #if !defined(USE_AURA) | |
388 gfx::GtkInitFromCommandLine(parsed_command_line_); | |
389 #endif | |
390 | |
391 SetUpGLibLogHandler(); | 383 SetUpGLibLogHandler(); |
392 #endif | 384 #endif |
393 | 385 |
394 if (parts_) | 386 if (parts_) |
395 parts_->PreEarlyInitialization(); | 387 parts_->PreEarlyInitialization(); |
396 | 388 |
397 #if defined(OS_WIN) | 389 #if defined(OS_WIN) |
398 net::EnsureWinsockInit(); | 390 net::EnsureWinsockInit(); |
399 #endif | 391 #endif |
400 | 392 |
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1123 base::TimeDelta::FromSeconds(delay_secs)); | 1115 base::TimeDelta::FromSeconds(delay_secs)); |
1124 } | 1116 } |
1125 | 1117 |
1126 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) { | 1118 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) { |
1127 is_tracing_startup_ = false; | 1119 is_tracing_startup_ = false; |
1128 TracingController::GetInstance()->DisableRecording( | 1120 TracingController::GetInstance()->DisableRecording( |
1129 trace_file, TracingController::TracingFileResultCallback()); | 1121 trace_file, TracingController::TracingFileResultCallback()); |
1130 } | 1122 } |
1131 | 1123 |
1132 } // namespace content | 1124 } // namespace content |
OLD | NEW |