| 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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 270              strstr(message, "Attempting to set the permissions of")) { | 270              strstr(message, "Attempting to set the permissions of")) { | 
| 271     LOG(ERROR) << message << " (http://crbug.com/161366)"; | 271     LOG(ERROR) << message << " (http://crbug.com/161366)"; | 
| 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")) { | 
|  | 281     LOG(ERROR) << message; | 
| 280   } else { | 282   } else { | 
| 281     LOG(DFATAL) << log_domain << ": " << message; | 283     LOG(DFATAL) << log_domain << ": " << message; | 
| 282   } | 284   } | 
| 283 } | 285 } | 
| 284 | 286 | 
| 285 static void SetUpGLibLogHandler() { | 287 static void SetUpGLibLogHandler() { | 
| 286   // Register GLib-handled assertions to go through our logging system. | 288   // Register GLib-handled assertions to go through our logging system. | 
| 287   const char* const kLogDomains[] = | 289   const char* const kLogDomains[] = | 
| 288       { nullptr, "Gtk", "Gdk", "GLib", "GLib-GObject" }; | 290       { nullptr, "Gtk", "Gdk", "GLib", "GLib-GObject" }; | 
| 289   for (size_t i = 0; i < arraysize(kLogDomains); i++) { | 291   for (size_t i = 0; i < arraysize(kLogDomains); i++) { | 
| (...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1783         BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 1785         BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 
| 1784         MediaInternals::GetInstance()); | 1786         MediaInternals::GetInstance()); | 
| 1785   } | 1787   } | 
| 1786   CHECK(audio_manager_); | 1788   CHECK(audio_manager_); | 
| 1787 | 1789 | 
| 1788   audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1790   audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 
| 1789   CHECK(audio_system_); | 1791   CHECK(audio_system_); | 
| 1790 } | 1792 } | 
| 1791 | 1793 | 
| 1792 }  // namespace content | 1794 }  // namespace content | 
| OLD | NEW | 
|---|