Gtk3: Use Gtk window bg color as Chrome toolbar color

chrome/browser/ui/libgtkui/native_theme_gtk3.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/ui/libgtkui/native_theme_gtk3.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h"
 #include "chrome/browser/ui/libgtkui/chrome_gtk_menu_subclasses.h"
@@ skipping 216 matching lines @@
                             : "GtkTextView.view:selected");
     case ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused:
       return GetSelectionBgColor(
           GtkVersionCheck(3, 20) ? "GtkTextView#textview.view #text #selection"
                                  : "GtkTextView.view:selected");
 
     // Tooltips
     case ui::NativeTheme::kColorId_TooltipBackground:
       return GetBgColor("GtkTooltip#tooltip");
     case ui::NativeTheme::kColorId_TooltipText:
-      return color_utils::GetReadableColor(GetFgColor("GtkTooltip#tooltip"),
-                                           GetBgColor("GtkTooltip#tooltip"));
+      return GetFgColor("GtkTooltip#tooltip GtkLabel");
 
     // Trees and Tables (implemented on GTK using the same class)
     case ui::NativeTheme::kColorId_TableBackground:
     case ui::NativeTheme::kColorId_TreeBackground:
       return GetBgColor(
           "GtkTreeView#treeview.view GtkTreeView#treeview.view.cell");
     case ui::NativeTheme::kColorId_TableText:
     case ui::NativeTheme::kColorId_TreeText:
     case ui::NativeTheme::kColorId_TableGroupingIndicatorColor:
       return GetFgColor(
@@ skipping 91 matching lines @@
               ui::NativeTheme::kColorId_TextfieldDefaultBackground));
     case ui::NativeTheme::kColorId_ResultsTableNegativeSelectedText:
       return color_utils::GetReadableColor(
           kNegativeTextColor,
           SkColorFromColorId(
               ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused));
 
     // Throbber
     // TODO(thomasanderson): Render GtkSpinner directly.
     case ui::NativeTheme::kColorId_ThrobberSpinningColor:
+      return GetFgColor("GtkSpinner#spinner");
     case ui::NativeTheme::kColorId_ThrobberWaitingColor:
-      return GetFgColor("GtkMenu#menu GtkSpinner#spinner");
     case ui::NativeTheme::kColorId_ThrobberLightColor:
-      return GetFgColor("GtkMenu#menu GtkSpinner#spinner:disabled");
+      return GetFgColor("GtkSpinner#spinner:disabled");
 
     // Alert icons
     // Fallback to the same colors as Aura.
     case ui::NativeTheme::kColorId_AlertSeverityLow:
     case ui::NativeTheme::kColorId_AlertSeverityMedium:
     case ui::NativeTheme::kColorId_AlertSeverityHigh: {
       // Alert icons appear on the toolbar, so use the toolbar BG
-      // color to determine if the dark Aura theme should be used.
+      // color (the GTK window bg color) to determine if the dark Aura
+      // theme should be used.
       ui::NativeTheme* fallback_theme =
-          color_utils::IsDark(GetBgColor("GtkToolbar#toolbar"))
+          color_utils::IsDark(GetBgColor(""))
               ? ui::NativeTheme::GetInstanceForNativeUi()
               : ui::NativeThemeDarkAura::instance();
       return fallback_theme->GetSystemColor(color_id);
     }
 
     case ui::NativeTheme::kColorId_NumColors:
       NOTREACHED();
       break;
   }
   return kInvalidColorIdColor;
@@ skipping 22 matching lines @@
   g_type_class_unref(g_type_class_ref(gtk_label_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_menu_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_menu_bar_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_menu_item_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_range_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_scrollbar_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_scrolled_window_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_separator_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_spinner_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_text_view_get_type()));
-  g_type_class_unref(g_type_class_ref(gtk_toolbar_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_tooltip_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_tree_view_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_window_get_type()));
 
   g_signal_connect_after(gtk_settings_get_default(), "notify::gtk-theme-name",
                          G_CALLBACK(OnThemeChanged), this);
 }
 
 // This doesn't actually get called
 NativeThemeGtk3::~NativeThemeGtk3() {}
@@ skipping 176 matching lines @@
 
   if (frame_top_area.incognito) {
     bitmap = SkBitmapOperations::CreateHSLShiftedBitmap(
         bitmap, kDefaultTintFrameIncognito);
   }
 
   canvas->drawBitmap(bitmap, rect.x(), rect.y());
 }
 
 }  // namespace libgtkui