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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 strstr(log_domain, "<unknown>")) { | 234 strstr(log_domain, "<unknown>")) { |
235 LOG(ERROR) << "DConf settings backend could not connect to session bus: " | 235 LOG(ERROR) << "DConf settings backend could not connect to session bus: " |
236 << "http://crbug.com/179797"; | 236 << "http://crbug.com/179797"; |
237 } else if (strstr(message, "Attempting to store changes into") || | 237 } else if (strstr(message, "Attempting to store changes into") || |
238 strstr(message, "Attempting to set the permissions of")) { | 238 strstr(message, "Attempting to set the permissions of")) { |
239 LOG(ERROR) << message << " (http://bugs.chromium.org/161366)"; | 239 LOG(ERROR) << message << " (http://bugs.chromium.org/161366)"; |
240 } else if (strstr(message, "drawable is not a native X11 window")) { | 240 } else if (strstr(message, "drawable is not a native X11 window")) { |
241 LOG(ERROR) << message << " (http://bugs.chromium.org/329991)"; | 241 LOG(ERROR) << message << " (http://bugs.chromium.org/329991)"; |
242 } else if (strstr(message, "Cannot do system-bus activation with no user")) { | 242 } else if (strstr(message, "Cannot do system-bus activation with no user")) { |
243 LOG(ERROR) << message << " (http://crbug.com/431005)"; | 243 LOG(ERROR) << message << " (http://crbug.com/431005)"; |
| 244 } else if (strstr(message, "deprecated")) { |
| 245 LOG(ERROR) << message; |
244 } else { | 246 } else { |
245 LOG(DFATAL) << log_domain << ": " << message; | 247 LOG(DFATAL) << log_domain << ": " << message; |
246 } | 248 } |
247 } | 249 } |
248 | 250 |
249 static void SetUpGLibLogHandler() { | 251 static void SetUpGLibLogHandler() { |
250 // Register GLib-handled assertions to go through our logging system. | 252 // Register GLib-handled assertions to go through our logging system. |
251 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" }; | 253 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" }; |
252 for (size_t i = 0; i < arraysize(kLogDomains); i++) { | 254 for (size_t i = 0; i < arraysize(kLogDomains); i++) { |
253 g_log_set_handler(kLogDomains[i], | 255 g_log_set_handler(kLogDomains[i], |
(...skipping 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1378 DCHECK(is_tracing_startup_for_duration_); | 1380 DCHECK(is_tracing_startup_for_duration_); |
1379 | 1381 |
1380 is_tracing_startup_for_duration_ = false; | 1382 is_tracing_startup_for_duration_ = false; |
1381 TracingController::GetInstance()->DisableRecording( | 1383 TracingController::GetInstance()->DisableRecording( |
1382 TracingController::CreateFileSink( | 1384 TracingController::CreateFileSink( |
1383 startup_trace_file_, | 1385 startup_trace_file_, |
1384 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1386 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
1385 } | 1387 } |
1386 | 1388 |
1387 } // namespace content | 1389 } // namespace content |
OLD | NEW |