Update to Chromium revision adb61db1 (#508578)

This commit is contained in:
Marshall Greenblatt
2017-10-20 13:45:20 -04:00
parent c80264ab11
commit 8b4980b4ca
95 changed files with 647 additions and 776 deletions

View File

@ -1,8 +1,8 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index 0acb460fe62d..5b0183fb7540 100644
index 7888e2f8589d..2b3e8dff4637 100644
--- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn
@@ -415,7 +415,7 @@ config("compiler") {
@@ -398,7 +398,7 @@ config("compiler") {
# chromeos binutils has been patched with the fix, so always use icf there.
# The bug only affects x86 and x64, so we can still use ICF when targeting
# other architectures.
@ -11,23 +11,3 @@ index 0acb460fe62d..5b0183fb7540 100644
!(current_cpu == "x86" || current_cpu == "x64")) {
ldflags += [ "-Wl,--icf=all" ]
}
diff --git chrome/browser/ui/libgtkui/gtk_ui.cc chrome/browser/ui/libgtkui/gtk_ui.cc
index f45f2b10a842..dbabf1bb7f3b 100644
--- chrome/browser/ui/libgtkui/gtk_ui.cc
+++ chrome/browser/ui/libgtkui/gtk_ui.cc
@@ -92,6 +92,7 @@ namespace libgtkui {
namespace {
+#if GTK_MAJOR_VERSION == 3
// We would like this to be a feature flag, but GtkUi gets initialized
// earlier than the feature flag registry, so just use a simple bool.
// The reason for wanting a flag is so that we can release the GTK3
@@ -100,6 +101,7 @@ namespace {
// Since this was never really intended to be toggled by users, this
// is fine for now.
const bool kUseGtkNavButtonLayoutManager = true;
+#endif
const double kDefaultDPI = 96;