Gtk3: Fix gn_all compile

remoting/host/disconnect_window_linux.cc

 // Copyright (c) 2012 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 <gtk/gtk.h>
 #include <math.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 36 matching lines @@
   GtkWidget* button_;
 
   // Used to distinguish resize events from other types of "configure-event"
   // notifications.
   int current_width_;
   int current_height_;
 
   DISALLOW_COPY_AND_ASSIGN(DisconnectWindowGtk);
 };
 
+#if GTK_MAJOR_VERSION == 2
 // Helper function for creating a rectangular path with rounded corners, as
 // Cairo doesn't have this facility.  |radius| is the arc-radius of each
 // corner.  The bounding rectangle extends from (0, 0) to (width, height).
 void AddRoundRectPath(cairo_t* cairo_context, int width, int height,
                       int radius) {
   cairo_new_sub_path(cairo_context);
   cairo_arc(cairo_context, width - radius, radius, radius, -M_PI_2, 0);
   cairo_arc(cairo_context, width - radius, height - radius, radius, 0, M_PI_2);
   cairo_arc(cairo_context, radius, height - radius, radius, M_PI_2, 2 * M_PI_2);
   cairo_arc(cairo_context, radius, radius, radius, 2 * M_PI_2, 3 * M_PI_2);
   cairo_close_path(cairo_context);
 }
+#endif
 
 DisconnectWindowGtk::DisconnectWindowGtk()
     : disconnect_window_(nullptr),
       current_width_(0),
       current_height_(0) {
 }
 
 DisconnectWindowGtk::~DisconnectWindowGtk() {
   DCHECK(CalledOnValidThread());
 
@@ skipping 52 matching lines @@
                    G_CALLBACK(OnButtonPressThunk), this);
 
   // All magic numbers taken from screen shots provided by UX.
   // The alignment sets narrow margins at the top and bottom, compared with
   // left and right.  The left margin is made larger to accommodate the
   // window movement gripper.
   GtkWidget* align = gtk_alignment_new(0, 0, 1, 1);
   gtk_alignment_set_padding(GTK_ALIGNMENT(align), 8, 8, 24, 12);
   gtk_container_add(GTK_CONTAINER(window), align);
 
+#if GTK_MAJOR_VERSION == 2
   GtkWidget* button_row = gtk_hbox_new(FALSE, 12);
+#else
+  GtkWidget* button_row = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
+  gtk_box_set_homogeneous(GTK_BOX(button_row), FALSE);
+#endif
   gtk_container_add(GTK_CONTAINER(align), button_row);
 
   button_ = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_STOP_SHARING_BUTTON).c_str());
   gtk_box_pack_end(GTK_BOX(button_row), button_, FALSE, FALSE, 0);
 
   g_signal_connect(button_, "clicked", G_CALLBACK(OnClickedThunk), this);
 
   message_ = gtk_label_new(nullptr);
   gtk_box_pack_end(GTK_BOX(button_row), message_, FALSE, FALSE, 0);
@@ skipping 38 matching lines @@
                                           GdkEventConfigure* event) {
   DCHECK(CalledOnValidThread());
 
   // Only generate bitmaps if the size has actually changed.
   if (event->width == current_width_ && event->height == current_height_)
     return FALSE;
 
   current_width_ = event->width;
   current_height_ = event->height;
 
+#if GTK_MAJOR_VERSION == 2

[Tom (Use chromium acct), 2017/02/01 00:02:42]

We can just let gtk draw the window background, right?

[Sergey Ulanov, 2017/02/02 00:42:49]

I don't think we want to omit this code. This code draws not only the
background, but also rounded corners, green border and gripper on the left. E.g.
here is the screenshot with GTK2:
https://drive.google.com/file/d/0B692SWJoRn0_cGszS09qakl0eEU/view?usp=sharing

   // Create the depth 1 pixmap for the window shape.
   GdkPixmap* shape_mask =
       gdk_pixmap_new(nullptr, current_width_, current_height_, 1);
   cairo_t* cairo_context = gdk_cairo_create(shape_mask);
 
   // Set the arc radius for the corners.
   const int kCornerRadius = 6;
 
   // Initialize the whole bitmap to be transparent.
   cairo_set_source_rgba(cairo_context, 0, 0, 0, 0);
@@ skipping 53 matching lines @@
   x += 3;
   cairo_move_to(cairo_context, x, gripper_top);
   cairo_line_to(cairo_context, x, gripper_bottom);
   cairo_stroke(cairo_context);
 
   cairo_destroy(cairo_context);
 
   gdk_window_set_back_pixmap(widget->window, background, FALSE);
   g_object_unref(background);
   gdk_window_invalidate_rect(widget->window, nullptr, TRUE);
+#endif
 
   return FALSE;
 }
 
 gboolean DisconnectWindowGtk::OnButtonPress(GtkWidget* widget,
                                             GdkEventButton* event) {
   DCHECK(CalledOnValidThread());
 
   gtk_window_begin_move_drag(GTK_WINDOW(disconnect_window_),
                              event->button,
                              event->x_root,
                              event->y_root,
                              event->time);
   return FALSE;
 }
 
 }  // namespace
 
 // static
 std::unique_ptr<HostWindow> HostWindow::CreateDisconnectWindow() {
   return base::MakeUnique<DisconnectWindowGtk>();
 }
 
 }  // namespace remoting