Build sync by default on all platforms. Add a command line parameter to enab...

chrome/chrome.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 106 matching lines @@
     'views_unit_tests_sources': [
       '../views/view_unittest.cc',
       '../views/focus/focus_manager_unittest.cc',
       '../views/controls/label_unittest.cc',
     ],
     'views_unit_tests_sources_win_specific': [
       # TODO(jcampan): make the following tests work on Linux.
       '../views/controls/table/table_view_unittest.cc',
       '../views/grid_layout_unittest.cc',
     ],
+    'browser_sync%': 1,
     'conditions': [
       ['OS=="win"', {
         'nacl_defines': [
           'NACL_WINDOWS=1',
           'NACL_LINUX=0',
           'NACL_OSX=0',
         ],
       },],
       ['OS=="linux"', {
         'nacl_defines': [
@@ skipping 12 matching lines @@
         'conditions': [
           ['branding=="Chrome"', {
             'mac_bundle_id': 'com.google.Chrome',
             'mac_creator': 'rimZ',
           }, {  # else: branding!="Chrome"
             'mac_bundle_id': 'org.chromium.Chromium',
             'mac_creator': 'Cr24',
           }],  # branding
         ],  # conditions
       }],  # OS=="mac"
-      ['OS=="win" or OS=="mac"', {
-        # Whether or not browser sync code is built in.
-        'browser_sync%': 1,
-      }, {
-        'browser_sync%': 0,
-      }],  # OS=="win"
       ['target_arch=="ia32"', {
         'nacl_defines': [
           # TODO(gregoryd): consider getting this from NaCl's common.gypi
           'NACL_TARGET_SUBARCH=32',
           'NACL_BUILD_SUBARCH=32',
         ],
       }],
       ['target_arch=="x64"', {
         'nacl_defines': [
           # TODO(gregoryd): consider getting this from NaCl's common.gypi
@@ skipping 2258 matching lines @@
             # Temporarily disabled while we figure some stuff out.
             # http://code.google.com/p/chromium/issues/detail?id=12351
             # '../build/linux/system.gyp:dbus-glib',
             # '../build/linux/system.gyp:gnome-keyring',
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:nss',
             '../base/base.gyp:linux_versioninfo',
           ],
           'sources!': [
+            'browser/sync/sync_setup_flow.cc',
+            'browser/sync/sync_setup_wizard.cc',
             'browser/views/extensions/extension_shelf.cc',
             'browser/views/extensions/extension_shelf.h',
             'browser/views/extensions/extension_view.cc',
             'browser/views/extensions/extension_view.h',
                     # Windows-specific files.
             'browser/password_manager/password_store_win.cc',
             'browser/password_manager/password_store_win.h',
           ],
           'sources': [
             'browser/net/ssl_config_service_manager_pref.cc',
@@ skipping 515 matching lines @@
             'browser/tab_contents/web_drag_source.cc',
             'browser/tab_contents/web_drop_target.cc',
           ],
         }],
         # views depends on webkit headers.
         ['OS=="win" or toolkit_views==1',{
           'dependencies': [
             '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
           ],
         }],
+        ['OS=="linux" and browser_sync==1', {
+          'sources': [
+            'browser/gtk/sync_setup_wizard_gtk.cc',
+            'browser/gtk/sync_setup_wizard_gtk.h',
+          ],
+        }],
       ],
     },
     {
       'target_name': 'debugger',
       'type': '<(library)',
       'msvs_guid': '57823D8C-A317-4713-9125-2C91FDFD12D6',
       'dependencies': [
         'chrome_resources',
         'chrome_strings',
         'theme_resources',
@@ skipping 1665 matching lines @@
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources': [
             'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
           ],
           'sources!': [
+            'browser/sync/sync_setup_wizard_unittest.cc',
             'browser/views/bookmark_context_menu_test.cc',
             'browser/gtk/options/cookies_view_unittest.cc',
             # Compact Language Detection (cld) is not supported in linux yet.
             '../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
           ],
         }],
         ['OS=="linux" and (toolkit_views==1 or chromeos==1)', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
@@ skipping 116 matching lines @@
             'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
             'browser/bookmarks/bookmark_table_model_unittest.cc',
             'browser/browser_unittest.cc',
             'browser/extensions/extension_process_manager_unittest.cc',
             'browser/importer/importer_unittest.cc',
             'browser/login_prompt_unittest.cc',
             'browser/printing/print_job_unittest.cc',
             'browser/rlz/rlz_unittest.cc',
             'browser/safe_browsing/safe_browsing_blocking_page_unittest.cc',
             'browser/search_engines/template_url_scraper_unittest.cc',
-            'browser/sync/profile_sync_service_unittest.cc',
             'browser/views/bookmark_editor_view_unittest.cc',
             'browser/views/find_bar_host_unittest.cc',
             'browser/views/keyword_editor_view_unittest.cc',
             'common/chrome_plugin_unittest.cc',
             'common/net/url_util_unittest.cc',
           ],
         }],
       ],
     },
     {
@@ skipping 1852 matching lines @@
             '../third_party/expat/expat.gyp:expat',
             '../third_party/libjingle/libjingle.gyp:libjingle',
             'sync_proto',
           ],
           'conditions': [
             ['OS=="linux"', {
               'defines': [
                 'POSIX',
                 'OS_LINUX',
               ],
+              'dependencies': [
+                '../build/linux/system.gyp:gtk'
+              ],
             }],
           ],
         },
         {
           'target_name': 'sync_unit_tests',
           'type': 'executable',
           'sources': [
             'browser/sync/engine/all_status_unittest.cc',
             'browser/sync/engine/apply_updates_command_unittest.cc',
             'browser/sync/engine/auth_watcher_unittest.cc',
             'browser/sync/engine/net/gaia_authenticator_unittest.cc',
             'browser/sync/engine/syncer_proto_util_unittest.cc',
             'browser/sync/engine/syncer_thread_unittest.cc',
             'browser/sync/engine/syncer_unittest.cc',
             'browser/sync/engine/syncproto_unittest.cc',
             'browser/sync/notifier/listener/talk_mediator_unittest.cc',
             'browser/sync/syncable/syncable_id_unittest.cc',
             'browser/sync/syncable/syncable_unittest.cc',
             'browser/sync/util/character_set_converters_unittest.cc',
             'browser/sync/util/crypto_helpers_unittest.cc',
-            'browser/sync/util/data_encryption_unittest.cc',
             'browser/sync/util/event_sys_unittest.cc',
             'browser/sync/util/highres_timer_unittest.cc',
             'browser/sync/util/path_helpers_unittest.cc',
             'browser/sync/util/query_helpers_unittest.cc',
             'browser/sync/util/user_settings_unittest.cc',
             'test/sync/engine/mock_gaia_authenticator.cc',
             'test/sync/engine/mock_gaia_authenticator.h',
             'test/sync/engine/mock_gaia_authenticator_unittest.cc',
             'test/sync/engine/mock_server_connection.cc',
             'test/sync/engine/mock_server_connection.h',
@@ skipping 13 matching lines @@
           'dependencies': [
             '../testing/gtest.gyp:gtest',
             '../third_party/libjingle/libjingle.gyp:libjingle',
             'notifier',
             'sync',
             'sync_proto',
             'test_support_unit',
           ],
           'conditions': [
             ['OS=="win"', {
+              'sources' : [
+                'browser/sync/util/data_encryption_unittest.cc',
+              ],
               'dependencies': [
                 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
               ],
               'link_settings': {
                 'libraries': [
                   '-lcrypt32.lib',
                   '-lws2_32.lib',
                   '-lsecur32.lib',
                 ],
               },
             }, { # else: OS != "win"
               'sources!': [
                 'browser/sync/util/data_encryption_unittest.cc',
               ],
             }],
             ['OS=="linux"', {
               'defines': [
                 'POSIX',
               ],
+              'dependencies': [
+                '../build/linux/system.gyp:gtk'
+              ],
             }],
           ],
         },
         {
           'target_name': 'sync',
           'type': '<(library)',
           'sources': [
             '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.cc',
             '<(protoc_out_dir)/chrome/browser/sync/protocol/sync.pb.h',
             'browser/sync/engine/all_status.cc',
@@ skipping 135 matching lines @@
               'sources' : [
                 'browser/sync/util/data_encryption.cc',
                 'browser/sync/util/data_encryption.h',
                 'browser/sync/util/path_helpers.cc',
               ],
             }],
             ['OS=="linux"', {
               'defines': [
                 'POSIX',
               ],
+              'dependencies': [
+                '../build/linux/system.gyp:gtk'
+              ],
             }],
             ['OS=="mac"', {
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
                 ],
               },
             }],
           ],
         },
       ],  # targets when browser_sync==1
     }],
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: