Gtk3 UI: Rename files in libgtkui containing gtk2 in their name

chrome/browser/ui/libgtkui/native_theme_gtk.cc

 // Copyright (c) 2013 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_gtk2.h"
+#include "chrome/browser/ui/libgtkui/native_theme_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h"
 #include "chrome/browser/ui/libgtkui/chrome_gtk_menu_subclasses.h"
-#include "chrome/browser/ui/libgtkui/gtk2_ui.h"
-#include "chrome/browser/ui/libgtkui/gtk2_util.h"
-#include "chrome/browser/ui/libgtkui/skia_utils_gtk2.h"
+#include "chrome/browser/ui/libgtkui/gtk_ui.h"
+#include "chrome/browser/ui/libgtkui/gtk_util.h"
+#include "chrome/browser/ui/libgtkui/skia_utils_gtk.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/native_theme/native_theme_dark_aura.h"
@@ skipping 20 matching lines @@
   double s = std::max(0.5, fg_hsl.s);
 
   // Make sure the luminance is at least as bright as the |kURLTextColor| green
   // would be if we were to use that.
   double l;
   if (fg_hsl.l < hue_hsl.l)
     l = hue_hsl.l;
   else
     l = (fg_hsl.l + hue_hsl.l) / 2;
 
-  color_utils::HSL output = { hue_hsl.h, s, l };
+  color_utils::HSL output = {hue_hsl.h, s, l};
   return color_utils::HSLToSkColor(output, 255);
 }
 
 // Generates the selected URL color, a green color used on URL text in the
 // currently highlighted entry in the autocomplete popup. It's a mix of
 // |kURLTextColor|, the current text color, and the background color (the
 // select highlight). It is more important to contrast with the background
 // saturation than to look exactly like the foreground color.
 SkColor SelectedURLColor(SkColor foreground, SkColor background) {
   color_utils::HSL fg_hsl, bg_hsl, hue_hsl;
   color_utils::SkColorToHSL(foreground, &fg_hsl);
   color_utils::SkColorToHSL(background, &bg_hsl);
   color_utils::SkColorToHSL(kURLTextColor, &hue_hsl);
 
   // The saturation of the text should be opposite of the background, clamped
   // to 0.2-0.8. We make sure it's greater than 0.2 so there's some color, but
   // less than 0.8 so it's not the oversaturated neon-color.
   double opposite_s = 1 - bg_hsl.s;
   double s = std::max(0.2, std::min(0.8, opposite_s));
 
   // The luminance should match the luminance of the foreground text.  Again,
   // we clamp so as to have at some amount of color (green) in the text.
   double opposite_l = fg_hsl.l;
   double l = std::max(0.1, std::min(0.9, opposite_l));
 
-  color_utils::HSL output = { hue_hsl.h, s, l };
+  color_utils::HSL output = {hue_hsl.h, s, l};
   return color_utils::HSLToSkColor(output, 255);
 }
 
 enum WidgetState {
   NORMAL = 0,
   ACTIVE = 1,
   PRELIGHT = 2,
   SELECTED = 3,
   INSENSITIVE = 4,
 };
@@ skipping 21 matching lines @@
 SkColor GetTextAAColor(GtkWidget* widget, WidgetState state) {
   return GdkColorToSkColor(gtk_rc_get_style(widget)->text_aa[stateMap[state]]);
 }
 SkColor GetBaseColor(GtkWidget* widget, WidgetState state) {
   return GdkColorToSkColor(gtk_rc_get_style(widget)->base[stateMap[state]]);
 }
 
 #else
 // Same order as enum WidgetState above
 const GtkStateFlags stateMap[] = {
-  GTK_STATE_FLAG_NORMAL,
-  GTK_STATE_FLAG_ACTIVE,
-  GTK_STATE_FLAG_PRELIGHT,
-  GTK_STATE_FLAG_SELECTED,
-  GTK_STATE_FLAG_INSENSITIVE,
+    GTK_STATE_FLAG_NORMAL,      GTK_STATE_FLAG_ACTIVE,
+    GTK_STATE_FLAG_PRELIGHT,    GTK_STATE_FLAG_SELECTED,
+    GTK_STATE_FLAG_INSENSITIVE,
 };
 
 SkColor GetFGColor(GtkWidget* widget, WidgetState state) {
   GdkRGBA color;
-  gtk_style_context_get_color(
-      gtk_widget_get_style_context(widget), stateMap[state], &color);
+  gtk_style_context_get_color(gtk_widget_get_style_context(widget),
+                              stateMap[state], &color);
   return SkColorSetRGB(color.red * 255, color.green * 255, color.blue * 255);
 }
 SkColor GetBGColor(GtkWidget* widget, WidgetState state) {
   GdkRGBA color;
 
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  gtk_style_context_get_background_color(
-      gtk_widget_get_style_context(widget), stateMap[state], &color);
+  gtk_style_context_get_background_color(gtk_widget_get_style_context(widget),
+                                         stateMap[state], &color);
   G_GNUC_END_IGNORE_DEPRECATIONS
 
   // Hack for default color
   if (color.alpha == 0.0)
     color = {1, 1, 1, 1};
 
   return SkColorSetRGB(color.red * 255, color.green * 255, color.blue * 255);
 }
 
 SkColor GetTextColor(GtkWidget* widget, WidgetState state) {
@@ skipping 53 matching lines @@
     const MenuItemExtraParams& menu_item) const {
   SkColor color;
   SkPaint paint;
   switch (state) {
     case NativeTheme::kNormal:
     case NativeTheme::kDisabled:
       color = GetSystemColor(NativeTheme::kColorId_MenuBackgroundColor);
       paint.setColor(color);
       break;
     case NativeTheme::kHovered:
-      color = GetSystemColor(
-          NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
+      color =
+          GetSystemColor(NativeTheme::kColorId_FocusedMenuItemBackgroundColor);
       paint.setColor(color);
       break;
     default:
       NOTREACHED() << "Invalid state " << state;
       break;
   }
   if (menu_item.corner_radius > 0) {
     const SkScalar radius = SkIntToScalar(menu_item.corner_radius);
     canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint);
     return;
@@ skipping 106 matching lines @@
     case kColorId_TextfieldReadOnlyColor:
       return GetTextColor(GetEntry(), SELECTED);
     case kColorId_TextfieldReadOnlyBackground:
       return GetBaseColor(GetEntry(), SELECTED);
     case kColorId_TextfieldSelectionColor:
       return GetTextColor(GetLabel(), SELECTED);
     case kColorId_TextfieldSelectionBackgroundFocused:
       return GetBaseColor(GetLabel(), SELECTED);
 #endif
 
-
     // Tooltips
     case kColorId_TooltipBackground:
       return GetBGColor(GetTooltip(), NORMAL);
     case kColorId_TooltipText:
       return GetFGColor(GetTooltip(), NORMAL);
 
     // Trees and Tables (implemented on GTK using the same class)
     case kColorId_TableBackground:
     case kColorId_TreeBackground:
       return GetBGColor(GetTree(), NORMAL);
     case kColorId_TableText:
     case kColorId_TreeText:
       return GetTextColor(GetTree(), NORMAL);
     case kColorId_TableSelectedText:
     case kColorId_TableSelectedTextUnfocused:
     case kColorId_TreeSelectedText:
     case kColorId_TreeSelectedTextUnfocused:
       return GetTextColor(GetTree(), SELECTED);
     case kColorId_TableSelectionBackgroundFocused:
     case kColorId_TableSelectionBackgroundUnfocused:
     case kColorId_TreeSelectionBackgroundFocused:
     case kColorId_TreeSelectionBackgroundUnfocused:
       return GetBGColor(GetTree(), SELECTED);
     case kColorId_TreeArrow:
       return GetFGColor(GetTree(), NORMAL);
     case kColorId_TableGroupingIndicatorColor:
       return GetTextAAColor(GetTree(), NORMAL);
 
-      // Results Table
+    // Results Table
     case kColorId_ResultsTableNormalBackground:
       return GetSystemColor(kColorId_TextfieldDefaultBackground);
     case kColorId_ResultsTableHoveredBackground:
       return color_utils::AlphaBlend(
           GetSystemColor(kColorId_TextfieldDefaultBackground),
-          GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused),
-          0x80);
+          GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused), 0x80);
     case kColorId_ResultsTableSelectedBackground:
       return GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused);
     case kColorId_ResultsTableNormalText:
     case kColorId_ResultsTableHoveredText:
       return GetSystemColor(kColorId_TextfieldDefaultColor);
     case kColorId_ResultsTableSelectedText:
       return GetSystemColor(kColorId_TextfieldSelectionColor);
     case kColorId_ResultsTableNormalDimmedText:
     case kColorId_ResultsTableHoveredDimmedText:
       return color_utils::AlphaBlend(
           GetSystemColor(kColorId_TextfieldDefaultColor),
-          GetSystemColor(kColorId_TextfieldDefaultBackground),
-          0x80);
+          GetSystemColor(kColorId_TextfieldDefaultBackground), 0x80);
     case kColorId_ResultsTableSelectedDimmedText:
       return color_utils::AlphaBlend(
           GetSystemColor(kColorId_TextfieldSelectionColor),
-          GetSystemColor(kColorId_TextfieldDefaultBackground),
-          0x80);
+          GetSystemColor(kColorId_TextfieldDefaultBackground), 0x80);
     case kColorId_ResultsTableNormalUrl:
     case kColorId_ResultsTableHoveredUrl:
       return NormalURLColor(GetSystemColor(kColorId_TextfieldDefaultColor));
 
     case kColorId_ResultsTableSelectedUrl:
       return SelectedURLColor(
           GetSystemColor(kColorId_TextfieldSelectionColor),
           GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused));
 
     case kColorId_ResultsTablePositiveText: {
@@ skipping 22 matching lines @@
     }
 
     // Throbber
     case kColorId_ThrobberSpinningColor:
     case kColorId_ThrobberLightColor:
       return GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused);
 
     case kColorId_ThrobberWaitingColor:
       return color_utils::AlphaBlend(
           GetSystemColor(kColorId_TextfieldSelectionBackgroundFocused),
-          GetBGColor(GetWindow(), NORMAL),
-          0x80);
+          GetBGColor(GetWindow(), NORMAL), 0x80);
 
     // Alert icons
     // Just fall back to the same colors as Aura.
     case kColorId_AlertSeverityLow:
     case kColorId_AlertSeverityMedium:
     case kColorId_AlertSeverityHigh: {
       ui::NativeTheme* fallback_theme =
           color_utils::IsDark(GetTextColor(GetEntry(), NORMAL))
               ? ui::NativeThemeAura::instance()
               : ui::NativeThemeDarkAura::instance();
@@ skipping 114 matching lines @@
 
   if (!fake_menu_item) {
     fake_menu_item = gtk_custom_menu_item_new();
     gtk_menu_shell_append(GTK_MENU_SHELL(GetMenu()), fake_menu_item);
   }
 
   return fake_menu_item;
 }
 
 }  // namespace libgtkui