Adding field trial branching code to use either the modal dialog or the bubble for sing in confirma…

build/common.gypi

 # 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 469 matching lines @@
           'use_titlecase_in_grd_files%': 1,
         }],
 
         # Enable file manager extension on Chrome OS.
         ['chromeos==1', {
           'file_manager_extension%': 1,
         }, {
           'file_manager_extension%': 0,
         }],
 
-        ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', {
+        ['OS=="win" or OS=="mac" or (OS=="linux")', {

[Roger Tawa OOO till Jul 10th, 2013/02/05 16:52:03]

I think you can remove the ( and ).

Does this prevent one click from being enabled on non-desktop platforms like
chromeos/android/ios?

[jwd, 2013/02/05 18:10:25]

This should work. This condition is used elsewhere to control things.

           'enable_one_click_signin%': 1,
         }],
 
         ['OS=="android"', {
           'enable_automation%': 0,
           'enable_extensions%': 0,
           'enable_google_now%': 0,
           'enable_language_detection%': 0,
           'enable_printing%': 0,
           'enable_themes%': 0,
@@ skipping 3532 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }