Initial gtk3 support

chrome/browser/ui/libgtk2ui/gtk2_border.cc

 // Copyright 2014 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/libgtk2ui/gtk2_border.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
@@ skipping 15 matching lines @@
 
 namespace libgtk2ui {
 
 namespace {
 
 const int kNumberOfFocusedStates = 2;
 
 class ButtonImageSkiaSource : public gfx::ImageSkiaSource {
  public:
   ButtonImageSkiaSource(const Gtk2UI* gtk2_ui,
-                        const GtkStateType state,
-                        const bool focused,
-                        const bool call_to_action,
+                        const GtkStateFlags state,
                         const gfx::Size& size)
       : gtk2_ui_(gtk2_ui),
         state_(state),
-        focused_(focused),
-        call_to_action_(call_to_action),
         size_(size) {
   }
 
   ~ButtonImageSkiaSource() override {}
 
   gfx::ImageSkiaRep GetImageForScale(float scale) override {
     int w = size_.width() * scale;
     int h = size_.height() * scale;
     return gfx::ImageSkiaRep(
-        gtk2_ui_->DrawGtkButtonBorder(state_, focused_, call_to_action_, w, h),
+        gtk2_ui_->DrawGtkButtonBorder(state_, w, h),
         scale);
   }
 
  private:
   const Gtk2UI* gtk2_ui_;
-  const GtkStateType state_;
-  const bool focused_;
-  const bool call_to_action_;
+  const GtkStateFlags state_;
   const gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(ButtonImageSkiaSource);
 };
 
 }  // namespace
 
 Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui,
                        views::LabelButton* owning_button,
                        scoped_ptr<views::LabelButtonBorder> border)
@@ skipping 63 matching lines @@
                             const gfx::Rect& rect,
                             gfx::Canvas* canvas) {
   bool focused = extra.button.is_focused;
   Button::ButtonState views_state = Button::GetButtonStateFrom(state);
 
   if (border_->GetPainter(focused, views_state) ||
       (focused && border_->GetPainter(false, views_state))) {
     gfx::ImageSkia* image = &button_images_[focused][views_state];
 
     if (image->isNull() || image->size() != rect.size()) {
-      bool call_to_action = owning_button_->GetClassName() ==
-          views::BlueButton::kViewClassName;

[Elliot Glaysher, 2015/07/20 19:31:40]

So while I personally don't like this feature, this was a compromise with the
designers; our "BlueButton" is a special "call to action" element with an accent
blue color to have it visually stand out. Even though it's not what GTK usually
does, having a button with a background set to the GTK default color was how we
compromised here, and has to be replicated.

[knthzh, 2015/07/21 15:48:27]

Okay. Where are the BlueButtons on the Chrome UI?

-      GtkStateType gtk_state = GetGtkState(state);
+      int gtk_state = GetGtkState(state);
+      if (focused)
+        gtk_state |= GTK_STATE_FLAG_FOCUSED;
+
       *image = gfx::ImageSkia(
           new ButtonImageSkiaSource(gtk2_ui_,
-                                    gtk_state,
-                                    focused,
-                                    call_to_action,
+                                    (GtkStateFlags)gtk_state,
                                     rect.size()),
           rect.size());
     }
     canvas->DrawImageInt(*image, rect.x(), rect.y());
   }
 }
 
 }  // namespace libgtk2ui