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

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

Issue 7791004: linux: delete code that worked around gtk <2.18 (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 | chrome/browser/printing/print_dialog_gtk.cc » ('j') | 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 536 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 strstr(message, "wrong ELF class: ELFCLASS64")) { 547 strstr(message, "wrong ELF class: ELFCLASS64")) {
548 // http://crbug.com/9643 548 // http://crbug.com/9643
549 // Until we have a real 64-bit build or all of these 32-bit package issues 549 // Until we have a real 64-bit build or all of these 32-bit package issues
550 // are sorted out, don't fatal on ELF 32/64-bit mismatch warnings and don't 550 // are sorted out, don't fatal on ELF 32/64-bit mismatch warnings and don't
551 // spam the user with more than one of them. 551 // spam the user with more than one of them.
552 static bool alerted = false; 552 static bool alerted = false;
553 if (!alerted) { 553 if (!alerted) {
554 LOG(ERROR) << "Bug 9643: " << log_domain << ": " << message; 554 LOG(ERROR) << "Bug 9643: " << log_domain << ": " << message;
555 alerted = true; 555 alerted = true;
556 } 556 }
557 } else if (strstr(message, "gtk_widget_size_allocate(): attempt to "
558 "allocate widget with width") &&
559 !GTK_CHECK_VERSION(2, 16, 1)) {
560 // This warning only occurs in obsolete versions of GTK and is harmless.
561 // http://crbug.com/11133
562 } else if (strstr(message, "Theme file for default has no") || 557 } else if (strstr(message, "Theme file for default has no") ||
563 strstr(message, "Theme directory") || 558 strstr(message, "Theme directory") ||
564 strstr(message, "theme pixmap")) { 559 strstr(message, "theme pixmap")) {
565 LOG(ERROR) << "GTK theme error: " << message; 560 LOG(ERROR) << "GTK theme error: " << message;
566 } else if (strstr(message, "gtk_drag_dest_leave: assertion")) { 561 } else if (strstr(message, "gtk_drag_dest_leave: assertion")) {
567 LOG(ERROR) << "Drag destination deleted: http://crbug.com/18557"; 562 LOG(ERROR) << "Drag destination deleted: http://crbug.com/18557";
568 } else if (strstr(message, "Out of memory") && 563 } else if (strstr(message, "Out of memory") &&
569 strstr(log_domain, "<unknown>")) { 564 strstr(log_domain, "<unknown>")) {
570 LOG(ERROR) << "DBus call timeout or out of memory: " 565 LOG(ERROR) << "DBus call timeout or out of memory: "
571 << "http://crosbug.com/15496"; 566 << "http://crosbug.com/15496";
(...skipping 1612 matching lines...) Expand 10 before | Expand all | Expand 10 after
2184 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2179 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2185 (pre_read == "0" || pre_read == "1")) { 2180 (pre_read == "0" || pre_read == "1")) {
2186 std::string uma_name(name); 2181 std::string uma_name(name);
2187 uma_name += "_PreRead"; 2182 uma_name += "_PreRead";
2188 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2183 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2189 AddPreReadHistogramTime(uma_name.c_str(), time); 2184 AddPreReadHistogramTime(uma_name.c_str(), time);
2190 } 2185 }
2191 #endif 2186 #endif
2192 } 2187 }
2193 2188
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/printing/print_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698