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/location.h" | 9 #include "base/location.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 LOG(ERROR) << "DConf settings backend could not connect to session bus: " | 228 LOG(ERROR) << "DConf settings backend could not connect to session bus: " |
229 << "http://crbug.com/179797"; | 229 << "http://crbug.com/179797"; |
230 } else if (strstr(message, "Attempting to store changes into") || | 230 } else if (strstr(message, "Attempting to store changes into") || |
231 strstr(message, "Attempting to set the permissions of")) { | 231 strstr(message, "Attempting to set the permissions of")) { |
232 LOG(ERROR) << message << " (http://bugs.chromium.org/161366)"; | 232 LOG(ERROR) << message << " (http://bugs.chromium.org/161366)"; |
233 } else if (strstr(message, "drawable is not a native X11 window")) { | 233 } else if (strstr(message, "drawable is not a native X11 window")) { |
234 LOG(ERROR) << message << " (http://bugs.chromium.org/329991)"; | 234 LOG(ERROR) << message << " (http://bugs.chromium.org/329991)"; |
235 } else if (strstr(message, "Cannot do system-bus activation with no user")) { | 235 } else if (strstr(message, "Cannot do system-bus activation with no user")) { |
236 LOG(ERROR) << message << " (http://crbug.com/431005)"; | 236 LOG(ERROR) << message << " (http://crbug.com/431005)"; |
237 } else { | 237 } else { |
238 LOG(DFATAL) << log_domain << ": " << message; | 238 LOG(ERROR) << log_domain << ": " << message; |
239 } | 239 } |
240 } | 240 } |
241 | 241 |
242 static void SetUpGLibLogHandler() { | 242 static void SetUpGLibLogHandler() { |
243 // Register GLib-handled assertions to go through our logging system. | 243 // Register GLib-handled assertions to go through our logging system. |
244 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" }; | 244 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" }; |
245 for (size_t i = 0; i < arraysize(kLogDomains); i++) { | 245 for (size_t i = 0; i < arraysize(kLogDomains); i++) { |
246 g_log_set_handler(kLogDomains[i], | 246 g_log_set_handler(kLogDomains[i], |
247 static_cast<GLogLevelFlags>(G_LOG_FLAG_RECURSION | | 247 static_cast<GLogLevelFlags>(G_LOG_FLAG_RECURSION | |
248 G_LOG_FLAG_FATAL | | 248 G_LOG_FLAG_FATAL | |
(...skipping 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1348 DCHECK(is_tracing_startup_); | 1348 DCHECK(is_tracing_startup_); |
1349 | 1349 |
1350 is_tracing_startup_ = false; | 1350 is_tracing_startup_ = false; |
1351 TracingController::GetInstance()->DisableRecording( | 1351 TracingController::GetInstance()->DisableRecording( |
1352 TracingController::CreateFileSink( | 1352 TracingController::CreateFileSink( |
1353 startup_trace_file_, | 1353 startup_trace_file_, |
1354 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1354 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
1355 } | 1355 } |
1356 | 1356 |
1357 } // namespace content | 1357 } // namespace content |
OLD | NEW |