diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 22:25:59 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-23 22:25:59 +0000 |
| commit | af7ebc2eadbf1a1658c1842e8c04c7736efb71d9 (patch) | |
| tree | 7bf917603a6eb2839d4318237573837166dbdcfd /chrome/browser | |
| parent | 1fcb1113ac499e6bc38f8d7ebf8f03a6635e7b81 (diff) | |
| download | chromium_src-af7ebc2eadbf1a1658c1842e8c04c7736efb71d9.zip chromium_src-af7ebc2eadbf1a1658c1842e8c04c7736efb71d9.tar.gz chromium_src-af7ebc2eadbf1a1658c1842e8c04c7736efb71d9.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/gtk/sync_setup_wizard_gtk.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/profile.cc | 2 |
4 files changed, 8 insertions, 3 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(); |