Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Side by Side Diff: content/browser/browser_main.cc

Issue 7983018: gtk: swallow spurious error (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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.h" 5 #include "content/browser/browser_main.h"
6 6
7 #include "base/allocator/allocator_shim.h" 7 #include "base/allocator/allocator_shim.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/logging.h" 10 #include "base/logging.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 } else if (strstr(message, "Theme file for default has no") || 128 } else if (strstr(message, "Theme file for default has no") ||
129 strstr(message, "Theme directory") || 129 strstr(message, "Theme directory") ||
130 strstr(message, "theme pixmap")) { 130 strstr(message, "theme pixmap")) {
131 LOG(ERROR) << "GTK theme error: " << message; 131 LOG(ERROR) << "GTK theme error: " << message;
132 } else if (strstr(message, "gtk_drag_dest_leave: assertion")) { 132 } else if (strstr(message, "gtk_drag_dest_leave: assertion")) {
133 LOG(ERROR) << "Drag destination deleted: http://crbug.com/18557"; 133 LOG(ERROR) << "Drag destination deleted: http://crbug.com/18557";
134 } else if (strstr(message, "Out of memory") && 134 } else if (strstr(message, "Out of memory") &&
135 strstr(log_domain, "<unknown>")) { 135 strstr(log_domain, "<unknown>")) {
136 LOG(ERROR) << "DBus call timeout or out of memory: " 136 LOG(ERROR) << "DBus call timeout or out of memory: "
137 << "http://crosbug.com/15496"; 137 << "http://crosbug.com/15496";
138 } else if (strstr(message, "XDG_RUNTIME_DIR variable not set")) {
139 LOG(ERROR) << message << " (http://bugs.chromium.org/97293)";
138 } else { 140 } else {
139 LOG(DFATAL) << log_domain << ": " << message; 141 LOG(DFATAL) << log_domain << ": " << message;
140 } 142 }
141 } 143 }
142 144
143 static void SetUpGLibLogHandler() { 145 static void SetUpGLibLogHandler() {
144 // Register GLib-handled assertions to go through our logging system. 146 // Register GLib-handled assertions to go through our logging system.
145 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" }; 147 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" };
146 for (size_t i = 0; i < arraysize(kLogDomains); i++) { 148 for (size_t i = 0; i < arraysize(kLogDomains); i++) {
147 g_log_set_handler(kLogDomains[i], 149 g_log_set_handler(kLogDomains[i],
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 base::win::ScopedCOMInitializer com_initializer; 415 base::win::ScopedCOMInitializer com_initializer;
414 #endif // OS_WIN 416 #endif // OS_WIN
415 417
416 base::StatisticsRecorder statistics; 418 base::StatisticsRecorder statistics;
417 419
418 parts->RunMainMessageLoopParts(); 420 parts->RunMainMessageLoopParts();
419 421
420 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 422 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
421 return parts->result_code(); 423 return parts->result_code();
422 } 424 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698