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

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

Issue 7031052: Dbus call timeout handled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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 "chrome/browser/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 "allocate widget with width") && 934 "allocate widget with width") &&
935 !GTK_CHECK_VERSION(2, 16, 1)) { 935 !GTK_CHECK_VERSION(2, 16, 1)) {
936 // This warning only occurs in obsolete versions of GTK and is harmless. 936 // This warning only occurs in obsolete versions of GTK and is harmless.
937 // http://crbug.com/11133 937 // http://crbug.com/11133
938 } else if (strstr(message, "Theme file for default has no") || 938 } else if (strstr(message, "Theme file for default has no") ||
939 strstr(message, "Theme directory") || 939 strstr(message, "Theme directory") ||
940 strstr(message, "theme pixmap")) { 940 strstr(message, "theme pixmap")) {
941 LOG(ERROR) << "GTK theme error: " << message; 941 LOG(ERROR) << "GTK theme error: " << message;
942 } else if (strstr(message, "gtk_drag_dest_leave: assertion")) { 942 } else if (strstr(message, "gtk_drag_dest_leave: assertion")) {
943 LOG(ERROR) << "Drag destination deleted: http://crbug.com/18557"; 943 LOG(ERROR) << "Drag destination deleted: http://crbug.com/18557";
944 } else if (strstr(message, "Out of memory") &&
945 strstr(log_domain, "<unknown>")) {
946 LOG(ERROR) << "DBus call timeout or out of memory: "
947 << "http://crosbug.com/15496";
944 } else { 948 } else {
945 LOG(DFATAL) << log_domain << ": " << message; 949 LOG(DFATAL) << log_domain << ": " << message;
946 } 950 }
947 } 951 }
948 952
949 static void SetUpGLibLogHandler() { 953 static void SetUpGLibLogHandler() {
950 // Register GLib-handled assertions to go through our logging system. 954 // Register GLib-handled assertions to go through our logging system.
951 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" }; 955 const char* kLogDomains[] = { NULL, "Gtk", "Gdk", "GLib", "GLib-GObject" };
952 for (size_t i = 0; i < arraysize(kLogDomains); i++) { 956 for (size_t i = 0; i < arraysize(kLogDomains); i++) {
953 g_log_set_handler(kLogDomains[i], 957 g_log_set_handler(kLogDomains[i],
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 #if defined(OS_CHROMEOS) 1959 #if defined(OS_CHROMEOS)
1956 // To be precise, logout (browser shutdown) is not yet done, but the 1960 // To be precise, logout (browser shutdown) is not yet done, but the
1957 // remaining work is negligible, hence we say LogoutDone here. 1961 // remaining work is negligible, hence we say LogoutDone here.
1958 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1962 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1959 false); 1963 false);
1960 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1964 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1961 #endif 1965 #endif
1962 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 1966 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
1963 return result_code; 1967 return result_code;
1964 } 1968 }
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