| 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 << "http://crosbug.com/15496"; | 223 << "http://crosbug.com/15496"; |
| 224 } else if (strstr(message, "Could not connect: Connection refused") && | 224 } else if (strstr(message, "Could not connect: Connection refused") && |
| 225 strstr(log_domain, "<unknown>")) { | 225 strstr(log_domain, "<unknown>")) { |
| 226 LOG(ERROR) << "DConf settings backend could not connect to session bus: " | 226 LOG(ERROR) << "DConf settings backend could not connect to session bus: " |
| 227 << "http://crbug.com/179797"; | 227 << "http://crbug.com/179797"; |
| 228 } else if (strstr(message, "XDG_RUNTIME_DIR variable not set")) { | 228 } else if (strstr(message, "XDG_RUNTIME_DIR variable not set")) { |
| 229 LOG(ERROR) << message << " (http://bugs.chromium.org/97293)"; | 229 LOG(ERROR) << message << " (http://bugs.chromium.org/97293)"; |
| 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")) { |
| 234 LOG(ERROR) << message << " (http://bugs.chromium.org/329991)"; |
| 233 } else { | 235 } else { |
| 234 LOG(DFATAL) << log_domain << ": " << message; | 236 LOG(DFATAL) << log_domain << ": " << message; |
| 235 } | 237 } |
| 236 } | 238 } |
| 237 | 239 |
| 238 static void SetUpGLibLogHandler() { | 240 static void SetUpGLibLogHandler() { |
| 239 // Register GLib-handled assertions to go through our logging system. | 241 // Register GLib-handled assertions to go through our logging system. |
| 240 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" }; | 242 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" }; |
| 241 for (size_t i = 0; i < arraysize(kLogDomains); i++) { | 243 for (size_t i = 0; i < arraysize(kLogDomains); i++) { |
| 242 g_log_set_handler(kLogDomains[i], | 244 g_log_set_handler(kLogDomains[i], |
| (...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 base::TimeDelta::FromSeconds(delay_secs)); | 1115 base::TimeDelta::FromSeconds(delay_secs)); |
| 1114 } | 1116 } |
| 1115 | 1117 |
| 1116 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) { | 1118 void BrowserMainLoop::EndStartupTracing(const base::FilePath& trace_file) { |
| 1117 is_tracing_startup_ = false; | 1119 is_tracing_startup_ = false; |
| 1118 TracingController::GetInstance()->DisableRecording( | 1120 TracingController::GetInstance()->DisableRecording( |
| 1119 trace_file, TracingController::TracingFileResultCallback()); | 1121 trace_file, TracingController::TracingFileResultCallback()); |
| 1120 } | 1122 } |
| 1121 | 1123 |
| 1122 } // namespace content | 1124 } // namespace content |
| OLD | NEW |