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/gtk/bookmark_bar_gtk.cc | |
| 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/gtk/bookmark_bar_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bar_gtk.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 7943521..b58f3ed 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -118,7 +118,7 @@ BookmarkBarGtk::BookmarkBarGtk(BrowserWindowGtk* window, model_(NULL), instructions_label_(NULL), instructions_(NULL), -#ifdef CHROME_PERSONALIZATION +#if defined(BROWSER_SYNC) sync_error_button_(NULL), sync_service_(NULL), #endif @@ -129,7 +129,7 @@ BookmarkBarGtk::BookmarkBarGtk(BrowserWindowGtk* window, menu_bar_helper_(this), floating_(false), last_allocation_width_(-1) { -#ifdef CHROME_PERSONALIZATION +#if defined(BROWSER_SYNC) if (profile->GetProfileSyncService()) { // Obtain a pointer to the profile sync service and add our instance as an // observer. @@ -156,7 +156,7 @@ BookmarkBarGtk::~BookmarkBarGtk() { bookmark_toolbar_.Destroy(); event_box_.Destroy(); -#ifdef CHROME_PERSONALIZATION +#if defined(BROWSER_SYNC) if (sync_service_) sync_service_->RemoveObserver(this); #endif @@ -266,7 +266,7 @@ void BookmarkBarGtk::Init(Profile* profile) { g_signal_connect(vseparator, "expose-event", G_CALLBACK(OnSeparatorExpose), this); -#ifdef CHROME_PERSONALIZATION +#if defined(BROWSER_SYNC) sync_error_button_ = theme_provider_->BuildChromeButton(); ConnectFolderButtonEvents(sync_error_button_); gtk_box_pack_start(GTK_BOX(bookmark_hbox_), sync_error_button_, @@ -336,7 +336,7 @@ void BookmarkBarGtk::Hide(bool animate) { } } -#ifdef CHROME_PERSONALIZATION +#if defined(BROWSER_SYNC) void BookmarkBarGtk::OnStateChanged() { // TODO(zork): TODO } |