      # Putting a variables dict inside another variables dict looks kind of
      # weird.  This is done so that 'host_arch', 'chromeos', etc are defined as
      # variables within the outer variables dict here.  This is necessary
+@@ -102,7 +115,7 @@
+             # TODO(erg): Merge this into the previous block once compiling with
+             # aura safely implies including ash capabilities.
+             ['OS=="linux"', {
+-              'use_aura%': 1,
++              'use_aura%': 0,
+             }],
+ 
+             # Whether we're a traditional desktop unix.
 @@ -2223,7 +2236,7 @@
      },
      'defines': [

           ['_type=="executable"', {
             'postbuilds': [
               {
Index: ipc/ipc_message_start.h
===================================================================
--- ipc/ipc_message_start.h	(revision 270117)
+++ ipc/ipc_message_start.h	(working copy)
@@ -50,6 +50,7 @@
   AudioMsgStart,
   MidiMsgStart,
   ChromeMsgStart,
+  ExoBrowserMsgStart,
   DragMsgStart,
   PrintMsgStart,
   SpellCheckMsgStart,
Index: tools/gritsettings/resource_ids
===================================================================
--- tools/gritsettings/resource_ids	(revision 270117)
+++ tools/gritsettings/resource_ids	(working copy)
@@ -199,4 +199,9 @@
     "includes": [30500],
   },
   # Resource ids starting at 31000 are reserved for projects built on Chromium.
+  "exo_browser/exo_browser_resources.grd": {
+    "includes": [32000],
+    "structures": [32100],
+    "messages": [32200],
+  },
 }

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 270117)
