diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-10 01:01:00 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-10 01:01:00 +0000 |
| commit | f5857bc22887f8bffe9fb3135768aa0286a927eb (patch) | |
| tree | 6e2211866cff4913dcb573e808775e85dc04892a /chrome | |
| parent | 15ff0e51410f9a17344849a3f16014d949e700b8 (diff) | |
| download | chromium_src-f5857bc22887f8bffe9fb3135768aa0286a927eb.zip chromium_src-f5857bc22887f8bffe9fb3135768aa0286a927eb.tar.gz chromium_src-f5857bc22887f8bffe9fb3135768aa0286a927eb.tar.bz2 | |
Render sync code inactive without any way to enable.
**** I WILL REVERT THIS PATCH IMMEDIATELY. It is a kill switch that may need to be merged in later. ***
Patching this CL is a quick shut-off mechanism in the event sync needs to de disabled prior to a release build.
TEST=No sync UI visible. about:sync shows 'SYNC_DISABLED', no 'Sync Data' folder created when run.
Review URL: http://codereview.chromium.org/270049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/profile.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/views/toolbar_view.cc | 7 |
3 files changed, 0 insertions, 20 deletions
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index b335810..e882b55 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -886,12 +886,6 @@ NewTabUI::NewTabUI(TabContents* contents) AddMessageHandler((new HistoryHandler())->Attach(this)); } -#ifdef CHROME_PERSONALIZATION - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { - AddMessageHandler((new NewTabPageSyncHandler())->Attach(this)); - } -#endif - AddMessageHandler((new NewTabPageSetHomepageHandler())->Attach(this)); // In testing mode there may not be an I/O thread. diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 4508644..3cf0025 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -1382,13 +1382,6 @@ void ProfileImpl::StopCreateSessionServiceTimer() { } ProfileSyncService* ProfileImpl::GetProfileSyncService() { -#ifdef CHROME_PERSONALIZATION - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { - if (!sync_service_.get()) - InitSyncService(); - return sync_service_.get(); - } -#endif return NULL; } diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index d21db27..c8169c3 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -1137,13 +1137,6 @@ void ToolbarView::CreateAppMenu() { } app_menu_contents_->AddSeparator(); -#ifdef CHROME_PERSONALIZATION - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { - app_menu_contents_->AddItem(IDC_SYNC_BOOKMARKS, - l10n_util::GetString(IDS_SYNC_MY_BOOKMARKS_LABEL) + L"..."); - app_menu_contents_->AddSeparator(); - } -#endif app_menu_contents_->AddItem(IDC_OPTIONS, l10n_util::GetStringFUTF16( IDS_OPTIONS, |