diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-10 01:09:44 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-10 01:09:44 +0000 |
| commit | 7367f1a6c69a9305795d3ab953ac197d43b58d52 (patch) | |
| tree | 76326f0c19a4dde6d4a09a1735d5ffab83f7b6be /chrome | |
| parent | 0a93894b92023e9ef211f106aa1080ad96fc12ca (diff) | |
| download | chromium_src-7367f1a6c69a9305795d3ab953ac197d43b58d52.zip chromium_src-7367f1a6c69a9305795d3ab953ac197d43b58d52.tar.gz chromium_src-7367f1a6c69a9305795d3ab953ac197d43b58d52.tar.bz2 | |
Revert r28645 - "Render sync code inactive..."
Vive le sync!
Review URL: http://codereview.chromium.org/269044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28649 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, 20 insertions, 0 deletions
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index e882b55..b335810 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -886,6 +886,12 @@ 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 3cf0025..4508644 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -1382,6 +1382,13 @@ 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 c8169c3..d21db27 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -1137,6 +1137,13 @@ 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, |