Make Gtk/Gdk/GLib errors/warnings really fatal.

chrome/app/chrome_dll_main.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(port): the ifdefs in here are a first step towards trying to determine
 // the correct abstraction for all the OS functionality required at this
 // stage of process initialization. It should not be taken as a final
 // abstraction.
 
 #include "build/build_config.h"
@@ skipping 141 matching lines @@
       return false;
     }
   }
 
   return true;
 }
 
 #endif  // OS_WIN
 
 #if defined(OS_LINUX)
-static void GtkFatalLogHandler(const gchar* log_domain,
-                               GLogLevelFlags log_level,
-                               const gchar* message,
-                               gpointer userdata) {
+static void GLibFatalLogHandler(const gchar* log_domain,
+                                GLogLevelFlags log_level,
+                                const gchar* message,
+                                gpointer userdata) {
   if (!log_domain)
-    log_domain = "<all>";
+    log_domain = "<unknown>";
   if (!message)
     message = "<no message>";
 
-  NOTREACHED() << "GTK: (" << log_domain << "): " << message;
+  LOG(FATAL) << log_domain << ": " << message;
 }
-#endif
+
+static void SetUpGLibLogHandler() {
+  // Register GLib-handled assertions to go through our logging system.
+  const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib" };
+  for (size_t i = 0; i < arraysize(kLogDomains); i++) {
+    g_log_set_handler(kLogDomains[i],
+                      static_cast<GLogLevelFlags>(G_LOG_FLAG_RECURSION |
+                                                  G_LOG_FLAG_FATAL |
+                                                  G_LOG_LEVEL_ERROR |
+                                                  G_LOG_LEVEL_CRITICAL |
+                                                  G_LOG_LEVEL_WARNING),
+                      GLibFatalLogHandler,
+                      NULL);
+  }
+}
+#endif  // defined(OS_LINUX)
 
 // Register the invalid param handler and pure call handler to be able to
 // notify breakpad when it happens.
 void RegisterInvalidParamHandler() {
 #if defined(OS_WIN)
   _set_invalid_parameter_handler(InvalidParameter);
   _set_purecall_handler(PureCall);
   // Gather allocation failure.
   _set_new_handler(&OnNoMemory);
   // Make sure malloc() calls the new handler too.
@@ skipping 213 matching lines @@
     rv = PluginMain(main_params);
 #endif
   } else if (process_type == switches::kWorkerProcess) {
 #if defined(OS_WIN)
     rv = WorkerMain(main_params);
 #endif
   } else if (process_type.empty()) {
 #if defined(OS_LINUX)
     // gtk_init() can change |argc| and |argv|, but nobody else uses them.
     gtk_init(&argc, const_cast<char***>(&argv));
-    // Register GTK assertions to go through our logging system.
-    g_log_set_handler(NULL,  // All logging domains.
-                      static_cast<GLogLevelFlags>(G_LOG_FLAG_RECURSION |
-                                                  G_LOG_FLAG_FATAL |
-                                                  G_LOG_LEVEL_ERROR |
-                                                  G_LOG_LEVEL_CRITICAL |
-                                                  G_LOG_LEVEL_WARNING),
-                      GtkFatalLogHandler,
-                      NULL);
+    SetUpGLibLogHandler();
 #endif
 
     ScopedOleInitializer ole_initializer;
     rv = BrowserMain(main_params);
   } else {
     NOTREACHED() << "Unknown process type";
   }
 
   if (!process_type.empty()) {
     ResourceBundle::CleanupSharedInstance();
   }
 
 #if defined(OS_WIN)
 #ifdef _CRTDBG_MAP_ALLOC
   _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
   _Module.Term();
 #endif
 
   logging::CleanupChromeLogging();
 
   return rv;
 }