Import Mojo Changes

build/config/ui.gni

Index: build/config/ui.gni
diff --git a/build/config/ui.gni b/build/config/ui.gni
index dc7a05905d7f085e525d10754b5b4d3e804b075f..72303ac945bb7847781264e55d9b6867f79f5a01 100644
--- a/build/config/ui.gni
+++ b/build/config/ui.gni
@@ -29,13 +29,16 @@ declare_args() {
 
   # True means the UI is built using the "views" framework.
   toolkit_views = is_win || is_chromeos || use_aura
+
+  # Whether we should use glib, a low level C utility library.
+  use_glib = is_linux && !use_ozone
 }
 
 # Additional dependent variables -----------------------------------------------
 #
 # These variables depend on other variables and can't be set externally.
 
-if (is_linux) {
+if (is_linux && use_glib) {
   use_cairo = true
   use_pango = true
 } else {
@@ -54,8 +57,6 @@ use_x11 = is_linux && !use_ozone
 
 use_ozone_evdev = use_ozone
 
-use_glib = is_linux && !use_ozone

[scottmg, 2015/01/20 18:09:51]

could it be "&& some_condition" down here instead of making it yet-another arg
to be configured?

[Elliot Glaysher, 2015/01/20 18:14:13]

I don't know how I'd do that. This file is copied directly into the mojo
repository (to support a bunch of copied chrome code), and there doesn't appear
to be a we_are_building_chrome_code_out_of_the_chrome_repo flag.

[scottmg, 2015/01/20 18:16:36]

OK. I meant more checking whatever it is that's not using glib now. But I guess
it's just "new UI that doesn't need it any more"?

-
 use_clipboard_aurax11 = is_linux && use_aura && use_x11
 
 use_athena = false