diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-17 00:28:13 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-17 00:28:13 +0000 |
| commit | 066629fad83ffbc3c3d67d2c19191d1da36138ef (patch) | |
| tree | 889cb8be535354b58bb3859b5c8c951f8bb3e79c /chrome/browser/dom_ui | |
| parent | 64e0ec0be0663c7f520c6cb9728c055edc916a89 (diff) | |
| download | chromium_src-066629fad83ffbc3c3d67d2c19191d1da36138ef.zip chromium_src-066629fad83ffbc3c3d67d2c19191d1da36138ef.tar.gz chromium_src-066629fad83ffbc3c3d67d2c19191d1da36138ef.tar.bz2 | |
Rename CHROME_PERSONALIZATION to BROWSER_SYNC.
Avoid #ifdef in general, favoring #if defined().
In one spot, use PlatformThread::Sleep instead of rolling our own.
Review URL: http://codereview.chromium.org/267125
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29360 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 | 4 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 2 |
3 files changed, 5 insertions, 5 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 e5239a5..7a24310 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifdef CHROME_PERSONALIZATION +#if defined(BROWSER_SYNC) #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h" @@ -227,4 +227,4 @@ void NewTabPageSyncHandler::SendSyncMessageToPage( dom_ui_->CallJavascriptFunction(L"syncMessageChanged", value); } -#endif // CHROME_PERSONALIZATION +#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 9774640..3e120ad 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.h +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.h @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifdef CHROME_PERSONALIZATION +#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 +68,4 @@ class NewTabPageSyncHandler : public DOMMessageHandler, }; #endif // CHROME_BROWSER_DOM_UI_NEW_TAB_PAGE_SYNC_HANDLER_H_ -#endif // CHROME_PERSONALIZATION +#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 238a46a..a432574 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -881,7 +881,7 @@ NewTabUI::NewTabUI(TabContents* contents) if (WebResourcesEnabled()) AddMessageHandler((new TipsHandler())->Attach(this)); -#ifdef CHROME_PERSONALIZATION +#if defined(BROWSER_SYNC) if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) { AddMessageHandler((new NewTabPageSyncHandler())->Attach(this)); } |