diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 22:49:23 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 22:49:23 +0000 |
| commit | 26413f102e91456639284b14a82a23850591527e (patch) | |
| tree | 02dcac1d76bd27709b18a98188e01235f05fe872 /chrome/browser/dom_ui | |
| parent | 2884f8e77c8df5d80414c70b8f775ae090eb7900 (diff) | |
| download | chromium_src-26413f102e91456639284b14a82a23850591527e.zip chromium_src-26413f102e91456639284b14a82a23850591527e.tar.gz chromium_src-26413f102e91456639284b14a82a23850591527e.tar.bz2 | |
Remove the browser_sync flag.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/337034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_page_sync_handler.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_page_sync_handler.h | 3 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc index c792445..3a05ed1 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if defined(BROWSER_SYNC) - #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h" #include "app/l10n_util.h" @@ -227,5 +225,3 @@ void NewTabPageSyncHandler::SendSyncMessageToPage( } dom_ui_->CallJavascriptFunction(L"syncMessageChanged", value); } - -#endif // defined(BROWSER_SYNC) diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.h b/chrome/browser/dom_ui/new_tab_page_sync_handler.h index 3e120ad..cde61da 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.h +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.h @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if defined(BROWSER_SYNC) - #ifndef CHROME_BROWSER_DOM_UI_NEW_TAB_PAGE_SYNC_HANDLER_H_ #define CHROME_BROWSER_DOM_UI_NEW_TAB_PAGE_SYNC_HANDLER_H_ @@ -68,4 +66,3 @@ class NewTabPageSyncHandler : public DOMMessageHandler, }; #endif // CHROME_BROWSER_DOM_UI_NEW_TAB_PAGE_SYNC_HANDLER_H_ -#endif // defined(BROWSER_SYNC) diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index 1e3bfa7..76c44ae 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) && !defined(OS_POSIX) +#if !defined(OS_POSIX) if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { AddMessageHandler((new NewTabPageSyncHandler())->Attach(this)); } |