Fix gtk3 build

This includes making it work when gtk2 is not installed.

BUG=none

Review-Url: https://codereview.chromium.org/2342163002
Cr-Commit-Position: refs/heads/master@{#419200}

build/config/linux/gtk3/BUILD.gn

@@ -28,8 +28,10 @@ group("gtk3") {
     "//chrome/browser/ui/libgtk2ui",
     "//gpu/gles2_conform_support:gles2_conform_test_windowless",
     "//remoting/host",
+    "//remoting/host/it2me:common",
     "//remoting/host/it2me:remote_assistance_host",
     "//remoting/host:remoting_me2me_host_static",
+    "//remoting/test:it2me_standalone_host_main",
   ]
   public_configs = [ ":gtk3_internal_config" ]
 }

chrome/browser/ui/libgtk2ui/gtk2_ui.cc

@@ -243,7 +243,11 @@ const color_utils::HSL kDefaultTintFrameIncognitoInactive = { -1, 0.3f, 0.6f };
 
 #if GTK_MAJOR_VERSION == 3
 const color_utils::HSL kDefaultTintFrameInactive = { -1, -1, 0.75f };
-#endif
+
+// The size of the rendered toolbar image.
+const int kToolbarImageWidth = 64;
+const int kToolbarImageHeight = 128;
+#endif  // GTK_MAJOR_VERSION == 3
 
 // Picks a button tint from a set of background colors. While
 // |accent_color| will usually be the same color through a theme, this

chrome/test/BUILD.gn

@@ -573,7 +573,11 @@ if (!is_android) {
           ]
           if (!use_ozone) {
             sources += [ "../browser/ui/libgtk2ui/select_file_dialog_interactive_uitest.cc" ]
-            configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ]
+            if (use_gtk3) {
+              configs += [ "//build/config/linux/gtk3:gtk3_internal_config" ]
+            } else {
+              configs += [ "//build/config/linux/gtk2:gtk2_internal_config" ]
+            }
           }
         }
       }

remoting/host/BUILD.gn

@@ -411,7 +411,11 @@ static_library("host") {
       "//build/config/linux:xrandr",
     ]
     if (is_desktop_linux) {
-      deps += [ "//build/config/linux/gtk2" ]
+      if (use_gtk3) {
+        deps += [ "//build/config/linux/gtk3" ]
+      } else {
+        deps += [ "//build/config/linux/gtk2" ]
+      }
     }
   } else {
     sources -= [
@@ -1154,7 +1158,11 @@ if (enable_me2me_host) {
     }
 
     if (is_desktop_linux) {
-      deps += [ "//build/config/linux/gtk2" ]
+      if (use_gtk3) {
+        deps += [ "//build/config/linux/gtk3" ]
+      } else {
+        deps += [ "//build/config/linux/gtk2" ]
+      }
     }
     if ((is_linux && !is_chromeos) || is_mac) {
       libs = [ "pam" ]

remoting/host/it2me/BUILD.gn

@@ -66,7 +66,11 @@ source_set("common") {
     # See crbug.com/462689 for details.
     all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ]
 
-    deps += [ "//build/config/linux/gtk2" ]
+    if (use_gtk3) {
+      deps += [ "//build/config/linux/gtk3" ]
+    } else {
+      deps += [ "//build/config/linux/gtk2" ]
+    }
   }
 }
 
@@ -230,7 +234,11 @@ if (!is_chromeos && !is_android && enable_remoting_host) {
       }
 
       if (is_desktop_linux) {
-        deps += [ "//build/config/linux/gtk2" ]
+        if (use_gtk3) {
+          deps += [ "//build/config/linux/gtk3" ]
+        } else {
+          deps += [ "//build/config/linux/gtk2" ]
+        }
       }
     }
   }

remoting/test/BUILD.gn

@@ -196,7 +196,11 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
     ]
 
     if (is_desktop_linux) {
-      deps += [ "//build/config/linux/gtk2" ]
+      if (use_gtk3) {
+        deps += [ "//build/config/linux/gtk3" ]
+      } else {
+        deps += [ "//build/config/linux/gtk2" ]
+      }
     }
   }
 }