| Index: build/common.gypi
 | 
| diff --git a/build/common.gypi b/build/common.gypi
 | 
| index 12e9e64448d1c194c849f0274106c0216f13749f..f6fee26a7e5df53089d1e24a21dc62a4975cebc8 100644
 | 
| --- a/build/common.gypi
 | 
| +++ b/build/common.gypi
 | 
| @@ -333,6 +333,9 @@
 | 
|        # disabling depends on the platform.
 | 
|        'enable_themes%': 1,
 | 
|  
 | 
| +      # Enables autofill dialog and associated features; disabled by default.
 | 
| +      'enable_autofill_dialog%' : 0,
 | 
| +
 | 
|        # Uses OEM-specific wallpaper resources on Chrome OS.
 | 
|        'use_oem_wallpaper%': 0,
 | 
|  
 | 
| @@ -488,6 +491,11 @@
 | 
|            'remoting%': 0,
 | 
|          }],
 | 
|  
 | 
| +        # Enable autofill dialog for Android and Views-enabled platforms for now.
 | 
| +        ['toolkit_views==1 or (OS=="android" and android_build_type==0)', {
 | 
| +          'enable_autofill_dialog%': 1
 | 
| +        }],
 | 
| +
 | 
|          ['OS=="android" and android_build_type==0', {
 | 
|            'enable_webrtc%': 1,
 | 
|          }],
 | 
| @@ -709,6 +717,7 @@
 | 
|      'enable_plugins%': '<(enable_plugins)',
 | 
|      'enable_session_service%': '<(enable_session_service)',
 | 
|      'enable_themes%': '<(enable_themes)',
 | 
| +    'enable_autofill_dialog%': '<(enable_autofill_dialog)',
 | 
|      'use_oem_wallpaper%': '<(use_oem_wallpaper)',
 | 
|      'enable_background%': '<(enable_background)',
 | 
|      'linux_use_gold_binary%': '<(linux_use_gold_binary)',
 | 
| @@ -1968,6 +1977,9 @@
 | 
|        ['enable_themes==1', {
 | 
|          'defines': ['ENABLE_THEMES=1'],
 | 
|        }],
 | 
| +      ['enable_autofill_dialog==1', {
 | 
| +        'defines': ['ENABLE_AUTOFILL_DIALOG=1'],
 | 
| +      }],
 | 
|        ['enable_background==1', {
 | 
|          'defines': ['ENABLE_BACKGROUND=1'],
 | 
|        }],
 | 
| 
 |