diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 17:23:43 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 17:23:43 +0000 |
| commit | eec3bcfa9e92a62fef68293ccbef32b6ef98eea7 (patch) | |
| tree | 0935285f90235f0303659055197f179fb5d7c23b /chrome/browser/dom_ui/new_tab_ui.cc | |
| parent | fc701137f192ee798ee6d9a41cf11fcb34d218bb (diff) | |
| download | chromium_src-eec3bcfa9e92a62fef68293ccbef32b6ef98eea7.zip chromium_src-eec3bcfa9e92a62fef68293ccbef32b6ef98eea7.tar.gz chromium_src-eec3bcfa9e92a62fef68293ccbef32b6ef98eea7.tar.bz2 | |
Turn on sync for OS X (behind an --enable-sync switch).
Added ProfileSyncService::IsSyncEnabled().
BUG=23073
TEST=manually (OS X),trybot
Review URL: http://codereview.chromium.org/389019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/new_tab_ui.cc')
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index 87181f0..2b4174b 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -31,6 +31,7 @@ #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/sessions/tab_restore_service.h" +#include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/user_data_manager.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/jstemplate_builder.h" @@ -565,12 +566,9 @@ NewTabUI::NewTabUI(TabContents* contents) AddMessageHandler((new MetricsHandler())->Attach(this)); if (WebResourcesEnabled()) AddMessageHandler((new TipsHandler())->Attach(this)); - -#if !defined(OS_POSIX) - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { + if (ProfileSyncService::IsSyncEnabled()) { AddMessageHandler((new NewTabPageSyncHandler())->Attach(this)); } -#endif AddMessageHandler((new NewTabPageSetHomepageHandler())->Attach(this)); |