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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
227 LOG(ERROR) << "DConf settings backend could not connect to session bus: " | 227 LOG(ERROR) << "DConf settings backend could not connect to session bus: " |
228 << "http://crbug.com/179797"; | 228 << "http://crbug.com/179797"; |
229 } else if (strstr(message, "Attempting to store changes into") || | 229 } else if (strstr(message, "Attempting to store changes into") || |
230 strstr(message, "Attempting to set the permissions of")) { | 230 strstr(message, "Attempting to set the permissions of")) { |
231 LOG(ERROR) << message << " (http://bugs.chromium.org/161366)"; | 231 LOG(ERROR) << message << " (http://bugs.chromium.org/161366)"; |
232 } else if (strstr(message, "drawable is not a native X11 window")) { | 232 } else if (strstr(message, "drawable is not a native X11 window")) { |
233 LOG(ERROR) << message << " (http://bugs.chromium.org/329991)"; | 233 LOG(ERROR) << message << " (http://bugs.chromium.org/329991)"; |
234 } else if (strstr(message, "Cannot do system-bus activation with no user")) { | 234 } else if (strstr(message, "Cannot do system-bus activation with no user")) { |
235 LOG(ERROR) << message << " (http://crbug.com/431005)"; | 235 LOG(ERROR) << message << " (http://crbug.com/431005)"; |
236 } else { | 236 } else { |
237 LOG(DFATAL) << log_domain << ": " << message; | 237 LOG(ERROR) << log_domain << ": " << message; |
Elliot Glaysher
2015/07/20 19:31:40
What messages were added here which tripped the DF
knthzh
2015/07/21 15:48:27
Whoops, didn't know git-cl doesn't preserve commit
| |
238 } | 238 } |
239 } | 239 } |
240 | 240 |
241 static void SetUpGLibLogHandler() { | 241 static void SetUpGLibLogHandler() { |
242 // Register GLib-handled assertions to go through our logging system. | 242 // Register GLib-handled assertions to go through our logging system. |
243 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" }; | 243 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" }; |
244 for (size_t i = 0; i < arraysize(kLogDomains); i++) { | 244 for (size_t i = 0; i < arraysize(kLogDomains); i++) { |
245 g_log_set_handler(kLogDomains[i], | 245 g_log_set_handler(kLogDomains[i], |
246 static_cast<GLogLevelFlags>(G_LOG_FLAG_RECURSION | | 246 static_cast<GLogLevelFlags>(G_LOG_FLAG_RECURSION | |
247 G_LOG_FLAG_FATAL | | 247 G_LOG_FLAG_FATAL | |
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1346 DCHECK(is_tracing_startup_); | 1346 DCHECK(is_tracing_startup_); |
1347 | 1347 |
1348 is_tracing_startup_ = false; | 1348 is_tracing_startup_ = false; |
1349 TracingController::GetInstance()->DisableRecording( | 1349 TracingController::GetInstance()->DisableRecording( |
1350 TracingController::CreateFileSink( | 1350 TracingController::CreateFileSink( |
1351 startup_trace_file_, | 1351 startup_trace_file_, |
1352 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); | 1352 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); |
1353 } | 1353 } |
1354 | 1354 |
1355 } // namespace content | 1355 } // namespace content |
OLD | NEW |