| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 } else if (strstr(message, "drawable is not a native X11 window")) { | 272 } else if (strstr(message, "drawable is not a native X11 window")) { |
| 273 LOG(ERROR) << message << " (http://crbug.com/329991)"; | 273 LOG(ERROR) << message << " (http://crbug.com/329991)"; |
| 274 } else if (strstr(message, "Cannot do system-bus activation with no user")) { | 274 } else if (strstr(message, "Cannot do system-bus activation with no user")) { |
| 275 LOG(ERROR) << message << " (http://crbug.com/431005)"; | 275 LOG(ERROR) << message << " (http://crbug.com/431005)"; |
| 276 } else if (strstr(message, "deprecated")) { | 276 } else if (strstr(message, "deprecated")) { |
| 277 LOG(ERROR) << message; | 277 LOG(ERROR) << message; |
| 278 } else if (strstr(message, "Could not obtain desktop path or name")) { | 278 } else if (strstr(message, "Could not obtain desktop path or name")) { |
| 279 LOG(ERROR) << message; | 279 LOG(ERROR) << message; |
| 280 } else if (strstr(message, "Theme parsing error")) { | 280 } else if (strstr(message, "Theme parsing error")) { |
| 281 LOG(ERROR) << message; | 281 LOG(ERROR) << message; |
| 282 } else if (strstr(message, "unknown signature")) { |
| 283 LOG(ERROR) << message; |
| 282 } else { | 284 } else { |
| 283 LOG(DFATAL) << log_domain << ": " << message; | 285 LOG(DFATAL) << log_domain << ": " << message; |
| 284 } | 286 } |
| 285 } | 287 } |
| 286 | 288 |
| 287 static void SetUpGLibLogHandler() { | 289 static void SetUpGLibLogHandler() { |
| 288 // Register GLib-handled assertions to go through our logging system. | 290 // Register GLib-handled assertions to go through our logging system. |
| 289 const char* const kLogDomains[] = | 291 const char* const kLogDomains[] = |
| 290 { nullptr, "Gtk", "Gdk", "GLib", "GLib-GObject" }; | 292 { nullptr, "Gtk", "Gdk", "GLib", "GLib-GObject" }; |
| 291 for (size_t i = 0; i < arraysize(kLogDomains); i++) { | 293 for (size_t i = 0; i < arraysize(kLogDomains); i++) { |
| (...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1785 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 1787 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
| 1786 MediaInternals::GetInstance()); | 1788 MediaInternals::GetInstance()); |
| 1787 } | 1789 } |
| 1788 CHECK(audio_manager_); | 1790 CHECK(audio_manager_); |
| 1789 | 1791 |
| 1790 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1792 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
| 1791 CHECK(audio_system_); | 1793 CHECK(audio_system_); |
| 1792 } | 1794 } |
| 1793 | 1795 |
| 1794 } // namespace content | 1796 } // namespace content |
| OLD | NEW |