Build sync by default on all platforms. This also turns off sync on both Linux and Mac, so that even though the code is compiled, it won't run.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/314016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29961 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 30 insertions, 11 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 07058af..544ba1b 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -653,7 +653,11 @@ void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
   command_updater_.UpdateCommandEnabled(IDC_REPORT_BUG, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui);
-  command_updater_.UpdateCommandEnabled(IDC_SYNC_BOOKMARKS, show_main_ui);
+#if defined(BROWSER_SYNC)
+  command_updater_.UpdateCommandEnabled(
+      IDC_SYNC_BOOKMARKS,
+      show_main_ui && profile_->GetProfileSyncService() != NULL);
+#endif
   command_updater_.UpdateCommandEnabled(IDC_OPTIONS, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_EDIT_SEARCH_ENGINES, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_VIEW_PASSWORDS, show_main_ui);
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 2a418c9..1e3bfa7 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -561,7 +561,7 @@ NewTabUI::NewTabUI(TabContents* contents)
     if (WebResourcesEnabled())
       AddMessageHandler((new TipsHandler())->Attach(this));
 
-#if defined(BROWSER_SYNC)
+#if defined(BROWSER_SYNC) && !defined(OS_POSIX)
     if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
       AddMessageHandler((new NewTabPageSyncHandler())->Attach(this));
     }
diff --git a/chrome/browser/gtk/sync_setup_wizard_gtk.cc b/chrome/browser/gtk/sync_setup_wizard_gtk.cc
index 01c4634..0bb8e61 100644
--- a/chrome/browser/gtk/sync_setup_wizard_gtk.cc
+++ b/chrome/browser/gtk/sync_setup_wizard_gtk.cc
@@ -29,6 +29,7 @@ void SyncSetupWizard::Step(State advance_state) {
     case MERGE_AND_SYNC:
     case FATAL_ERROR:
     case DONE:
+    case DONE_FIRST_TIME:
       // TODO(zork): Implement
       break;
     default:
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index b8af2e9..e44a61c 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -1355,7 +1355,7 @@ void ProfileImpl::StopCreateSessionServiceTimer() {
 }
 
 ProfileSyncService* ProfileImpl::GetProfileSyncService() {
-#if defined(BROWSER_SYNC)
+#if defined(BROWSER_SYNC) && !defined(OS_POSIX)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
     if (!sync_service_.get())
       InitSyncService();
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 98ce90b..7c9aa6e 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -126,6 +126,7 @@
       '../views/controls/table/table_view_unittest.cc',
       '../views/grid_layout_unittest.cc',
     ],
+    'browser_sync%': 1,
     'conditions': [
       ['OS=="win"', {
         'nacl_defines': [
@@ -158,12 +159,6 @@
           }],  # 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
@@ -2451,6 +2446,8 @@
             '../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',
@@ -2989,6 +2986,12 @@
             '../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',
+          ],
+        }],
       ],
     },
     {
@@ -4677,6 +4680,7 @@
             '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.
@@ -4813,7 +4817,6 @@
             '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',
@@ -6695,6 +6698,9 @@
                 'POSIX',
                 'OS_LINUX',
               ],
+              'dependencies': [
+                '../build/linux/system.gyp:gtk'
+              ],
             }],
           ],
         },
@@ -6715,7 +6721,6 @@
             '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',
@@ -6749,6 +6754,9 @@
           ],
           'conditions': [
             ['OS=="win"', {
+              'sources' : [
+                'browser/sync/util/data_encryption_unittest.cc',
+              ],
               'dependencies': [
                 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
               ],
@@ -6768,6 +6776,9 @@
               'defines': [
                 'POSIX',
               ],
+              'dependencies': [
+                '../build/linux/system.gyp:gtk'
+              ],
             }],
           ],
         },
@@ -6923,6 +6934,9 @@
               'defines': [
                 'POSIX',
               ],
+              'dependencies': [
+                '../build/linux/system.gyp:gtk'
+              ],
             }],
             ['OS=="mac"', {
               'link_settings': {