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

7 files changed, 62 insertions, 69 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 5f5007e..5eba994 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -112,7 +112,7 @@ static const SkColor kInstructionsColor = SkColorSetRGB(128, 128, 142);
 // Tag for the 'Other bookmarks' button.
 static const int kOtherFolderButtonTag = 1;
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
 // Tag for the sync error button.
 static const int kSyncErrorButtonTag = 2;
 #endif
@@ -368,7 +368,7 @@ BookmarkBarView::BookmarkBarView(Profile* profile, Browser* browser)
       other_bookmarked_button_(NULL),
       model_changed_listener_(NULL),
       show_folder_drop_menu_task_(NULL),
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
       sync_error_button_(NULL),
       sync_service_(NULL),
 #endif
@@ -377,7 +377,7 @@ BookmarkBarView::BookmarkBarView(Profile* profile, Browser* browser)
       bookmarks_separator_view_(NULL),
       browser_(browser),
       throbbing_view_(NULL) {
-#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.
@@ -402,9 +402,9 @@ BookmarkBarView::~BookmarkBarView() {
     model_->RemoveObserver(this);
   StopShowFolderDropMenuTimer();
 
-#ifdef CHROME_PERSONALIZATION
-if (sync_service_)
-  sync_service_->RemoveObserver(this);
+#if defined(BROWSER_SYNC)
+  if (sync_service_)
+    sync_service_->RemoveObserver(this);
 #endif
 }
 
@@ -464,7 +464,7 @@ gfx::Size BookmarkBarView::GetMinimumSize() {
   }
 
   int sync_error_total_width = 0;
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   gfx::Size sync_error_button_pref = sync_error_button_->GetPreferredSize();
   if (ShouldShowSyncErrorButton())
     sync_error_total_width += kButtonPadding + sync_error_button_pref.width();
@@ -716,7 +716,7 @@ void BookmarkBarView::SetAccessibleName(const std::wstring& name) {
   accessible_name_.assign(name);
 }
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
 void BookmarkBarView::OnStateChanged() {
   // When the sync state changes, it is sufficient to invoke View::Layout since
   // during layout we query the profile sync service and determine whether the
@@ -730,7 +730,7 @@ void BookmarkBarView::OnStateChanged() {
   Layout();
   SchedulePaint();
 }
-#endif
+#endif  // defined(BROWSER_SYNC)
 
 void BookmarkBarView::OnFullscreenToggled(bool fullscreen) {
   if (!fullscreen)
@@ -811,7 +811,7 @@ void BookmarkBarView::Init() {
   other_bookmarked_button_ = CreateOtherBookmarkedButton();
   AddChildView(other_bookmarked_button_);
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   sync_error_button_ = CreateSyncErrorButton();
   AddChildView(sync_error_button_);
 #endif
@@ -870,7 +870,7 @@ MenuButton* BookmarkBarView::CreateOverflowButton() {
 }
 
 int BookmarkBarView::GetBookmarkButtonCount() {
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   // We contain at least four non-bookmark button views: other bookmarks,
   // bookmarks separator, chevrons (for overflow), the instruction label and
   // the sync error button.
@@ -1125,7 +1125,7 @@ void BookmarkBarView::RunMenu(views::View* view, const gfx::Point& pt) {
 
 void BookmarkBarView::ButtonPressed(views::Button* sender,
                                     const views::Event& event) {
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   // Show the login wizard if the user clicked the re-login button.
   if (sender->tag() == kSyncErrorButtonTag) {
     DCHECK(sender == sync_error_button_);
@@ -1589,21 +1589,17 @@ gfx::Size BookmarkBarView::LayoutItems(bool compute_bounds_only) {
   gfx::Size bookmarks_separator_pref =
       bookmarks_separator_view_->GetPreferredSize();
 
-#ifdef CHROME_PERSONALIZATION
+  int sync_error_total_width = 0;
+#if defined(BROWSER_SYNC)
   gfx::Size sync_error_button_pref = sync_error_button_->GetPreferredSize();
   const bool should_show_sync_error_button = ShouldShowSyncErrorButton();
-  int sync_error_total_width = 0;
   if (should_show_sync_error_button) {
     sync_error_total_width += kButtonPadding + sync_error_button_pref.width();
   }
-  const int max_x = width - other_bookmarked_pref.width() - kButtonPadding -
-              overflow_pref.width() - kButtonPadding -
-              bookmarks_separator_pref.width() - sync_error_total_width;
-#else
-  const int max_x = width - other_bookmarked_pref.width() - kButtonPadding -
-              overflow_pref.width() - kButtonPadding -
-              bookmarks_separator_pref.width();
 #endif
+  const int max_x = width - other_bookmarked_pref.width() - kButtonPadding -
+      overflow_pref.width() - kButtonPadding -
+      bookmarks_separator_pref.width() - sync_error_total_width;
 
   // Next, layout out the buttons. Any buttons that are placed beyond the
   // visible region and made invisible.
@@ -1669,7 +1665,7 @@ gfx::Size BookmarkBarView::LayoutItems(bool compute_bounds_only) {
   }
   x += other_bookmarked_pref.width() + kButtonPadding;
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   // Set the real bounds of the sync error button only if it needs to appear on
   // the bookmarks bar.
   if (should_show_sync_error_button) {
@@ -1684,7 +1680,7 @@ gfx::Size BookmarkBarView::LayoutItems(bool compute_bounds_only) {
     sync_error_button_->SetBounds(x, y, 0, height);
     sync_error_button_->SetVisible(false);
   }
-#endif
+#endif  // defined(BROWSER_SYNC)
 
   // Set the preferred size computed so far.
   if (compute_bounds_only) {
@@ -1704,7 +1700,7 @@ gfx::Size BookmarkBarView::LayoutItems(bool compute_bounds_only) {
   return prefsize;
 }
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
 // The sync state reported by the profile sync service determines whether or
 // not the re-login indicator button should be visible.
 bool BookmarkBarView::ShouldShowSyncErrorButton() {
@@ -1738,5 +1734,5 @@ views::TextButton* BookmarkBarView::CreateSyncErrorButton() {
       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
   return sync_error_button;
 }
-#endif
+#endif  // defined(BROWSER_SYNC)
 
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index 90295fc..c7008fb7 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -35,7 +35,7 @@ class MenuItemView;
 // waits until the HistoryService for the profile has been loaded before
 // creating the BookmarkModel.
 class BookmarkBarView : public DetachableToolbarView,
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
                         public ProfileSyncServiceObserver,
 #endif
                         public BookmarkModelObserver,
@@ -117,7 +117,7 @@ class BookmarkBarView : public DetachableToolbarView,
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
   virtual void SetAccessibleName(const std::wstring& name);
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
 #endif
@@ -403,7 +403,7 @@ class BookmarkBarView : public DetachableToolbarView,
   // desired bounds. If |compute_bounds_only| = FALSE, the bounds are set.
   gfx::Size LayoutItems(bool compute_bounds_only);
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   // Determines whether the sync error button should appear on the bookmarks
   // bar.
   bool ShouldShowSyncErrorButton();
@@ -443,7 +443,7 @@ class BookmarkBarView : public DetachableToolbarView,
   // Used to track drops on the bookmark bar view.
   scoped_ptr<DropInfo> drop_info_;
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   // The sync re-login indicator which appears when the user needs to re-enter
   // credentials in order to continue syncing.
   views::TextButton* sync_error_button_;
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 1cad2735..959e916 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -21,7 +21,9 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/metrics/user_metrics.h"
+#include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/sync/sync_status_ui_helper.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/bookmark_folder_tree_view.h"
 #include "chrome/browser/views/bookmark_table_view.h"
@@ -31,20 +33,15 @@
 #include "grit/locale_settings.h"
 #include "skia/ext/skia_utils.h"
 #include "third_party/skia/include/core/SkShader.h"
-#include "views/grid_layout.h"
 #include "views/controls/button/menu_button.h"
-#include "views/controls/menu/menu_item_view.h"
 #include "views/controls/label.h"
+#include "views/controls/menu/menu_item_view.h"
 #include "views/controls/single_split_view.h"
+#include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
-#if defined(CHROME_PERSONALIZATION)
-#include "chrome/browser/options_window.h"
-#include "chrome/browser/sync/sync_status_ui_helper.h"
-#endif
-
 // If non-null, there is an open editor and this is the window it is contained
 // in it.
 static views::Window* open_window = NULL;
@@ -168,7 +165,7 @@ BookmarkManagerView::BookmarkManagerView(Profile* profile)
     : profile_(profile->GetOriginalProfile()),
       table_view_(NULL),
       tree_view_(NULL),
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
       sync_status_button_(NULL),
       sync_service_(NULL),
 #endif
@@ -210,7 +207,7 @@ BookmarkManagerView::BookmarkManagerView(Profile* profile)
                         0, views::GridLayout::USE_PREF, 0, 0);
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                         0, views::GridLayout::USE_PREF, 0, 0);
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                         0, views::GridLayout::USE_PREF, 0, 0);
 #endif
@@ -229,7 +226,7 @@ BookmarkManagerView::BookmarkManagerView(Profile* profile)
   layout->StartRow(0, top_id);
   layout->AddView(organize_menu_button);
   layout->AddView(tools_menu_button);
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
   sync_status_button_ = new views::TextButton(this, std::wstring());
   layout->AddView(sync_status_button_);
 #endif
@@ -249,7 +246,7 @@ BookmarkManagerView::BookmarkManagerView(Profile* profile)
   if (!bookmark_model->IsLoaded())
     bookmark_model->AddObserver(this);
 
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
   if (profile->GetProfileSyncService()) {
     sync_service_ = profile_->GetProfileSyncService();
     sync_service_->AddObserver(this);
@@ -274,7 +271,7 @@ BookmarkManagerView::~BookmarkManagerView() {
   manager = NULL;
   open_window = NULL;
 
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
   if (sync_service_)
     sync_service_->RemoveObserver(this);
 #endif
@@ -386,7 +383,7 @@ void BookmarkManagerView::WindowClosing() {
       prefs::kBookmarkManagerSplitLocation, split_view_->divider_offset());
 }
 
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
 void BookmarkManagerView::OnStateChanged() {
   UpdateSyncStatus();
 }
@@ -524,7 +521,7 @@ void BookmarkManagerView::OnTreeViewKeyDown(unsigned short virtual_keycode) {
   }
 }
 
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
 void BookmarkManagerView::ButtonPressed(views::Button* sender,
                                         const views::Event& event) {
   if (sender == sync_status_button_) {
@@ -835,7 +832,7 @@ void BookmarkManagerView::ShowExportBookmarksFileChooser() {
       reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU));
 }
 
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
 void BookmarkManagerView::UpdateSyncStatus() {
   DCHECK(sync_service_);
   std::wstring status_label;
@@ -865,4 +862,4 @@ void BookmarkManagerView::OpenSyncMyBookmarksDialog() {
         ProfileSyncService::START_FROM_BOOKMARK_MANAGER);
   }
 }
-#endif
+#endif  // defined(BROWSER_SYNC)
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index cfbc33a..608b8c7 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -43,7 +43,7 @@ class BookmarkManagerView : public views::View,
                             public views::TreeViewController,
                             public views::ViewMenuDelegate,
                             public views::WindowDelegate,
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
                             public views::ButtonListener,
                             public ProfileSyncServiceObserver,
 #endif
@@ -94,7 +94,7 @@ class BookmarkManagerView : public views::View,
   //virtual bool ShouldShowWindowIcon() const { return true; }
   virtual void WindowClosing();
 
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
 #endif
@@ -118,7 +118,7 @@ class BookmarkManagerView : public views::View,
   virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view);
   virtual void OnTreeViewKeyDown(unsigned short virtual_keycode);
 
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
   // views::ButtonListener method.
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 #endif
@@ -213,7 +213,7 @@ class BookmarkManagerView : public views::View,
   void ShowImportBookmarksFileChooser();
   void ShowExportBookmarksFileChooser();
 
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
   void UpdateSyncStatus();
   void OpenSyncMyBookmarksDialog();
 #endif
@@ -229,7 +229,7 @@ class BookmarkManagerView : public views::View,
   // Import/export file dialog.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
-#if defined(CHROME_PERSONALIZATION)
+#if defined(BROWSER_SYNC)
   // The sync status button that notifies the user about the current status of
   // bookmarks synchronization.
   views::TextButton* sync_status_button_;
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index a3df28c..cc56a6d 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -35,7 +35,7 @@ namespace {
 const int kPasswordSavingRadioGroup = 1;
 const int kFormAutofillRadioGroup = 2;
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
 // Background color for the status label when it's showing an error.
 static const SkColor kSyncLabelErrorBgColor = SkColorSetRGB(0xff, 0x9a, 0x9a);
 
@@ -59,7 +59,7 @@ ContentPageView::ContentPageView(Profile* profile)
       browsing_data_group_(NULL),
       import_button_(NULL),
       clear_data_button_(NULL),
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
       sync_group_(NULL),
       sync_status_label_(NULL),
       sync_action_link_(NULL),
@@ -67,7 +67,7 @@ ContentPageView::ContentPageView(Profile* profile)
       sync_service_(NULL),
 #endif
       OptionsPageView(profile) {
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   if (profile->GetProfileSyncService()) {
     sync_service_ = profile->GetProfileSyncService();
     sync_service_->AddObserver(this);
@@ -76,7 +76,7 @@ ContentPageView::ContentPageView(Profile* profile)
 }
 
 ContentPageView::~ContentPageView() {
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   if (sync_service_)
     sync_service_->RemoveObserver(this);
 #endif
@@ -125,7 +125,7 @@ void ContentPageView::ButtonPressed(
       GetWindow()->GetNativeWindow(),
       gfx::Rect(),
       new ClearBrowsingDataView(profile()))->Show();
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   } else if (sender == sync_start_stop_button_) {
     DCHECK(sync_service_);
 
@@ -157,7 +157,7 @@ void ContentPageView::LinkActivated(views::Link* source, int event_flags) {
         GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
     return;
   }
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   DCHECK_EQ(source, sync_action_link_);
   DCHECK(sync_service_);
   sync_service_->ShowLoginDialog();
@@ -180,7 +180,7 @@ void ContentPageView::InitControlLayout() {
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   if (sync_service_) {
     layout->StartRow(0, single_column_view_set_id);
     InitSyncGroup();
@@ -243,7 +243,7 @@ void ContentPageView::NotifyPrefChanged(const std::wstring* pref_name) {
 // ContentsPageView, views::View overrides:
 
 void ContentPageView::Layout() {
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   if (is_initialized())
     UpdateSyncControls();
 #endif
@@ -255,7 +255,7 @@ void ContentPageView::Layout() {
       0, 0, passwords_group_->GetContentsWidth(), 0);
   browsing_data_label_->SetBounds(
       0, 0, browsing_data_group_->GetContentsWidth(), 0);
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   if (is_initialized()) {
     sync_status_label_->SetBounds(
         0, 0, sync_group_->GetContentsWidth(), 0);
@@ -268,7 +268,7 @@ void ContentPageView::Layout() {
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentsPageView, ProfileSyncServiceObserver implementation:
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
 void ContentPageView::OnStateChanged() {
   // If the UI controls are not yet initialized, then don't do anything. This
   // can happen if the Options dialog is up, but the Content tab is not yet
@@ -437,7 +437,7 @@ void ContentPageView::OnConfirmMessageAccept() {
   ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
 }
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
 void ContentPageView::InitSyncGroup() {
   sync_status_label_ = new views::Label;
   sync_status_label_->SetMultiLine(true);
@@ -502,4 +502,4 @@ void ContentPageView::UpdateSyncControls() {
   }
 }
 
-#endif
+#endif  // defined(BROWSER_SYNC)
diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h
index e3902c4..91febde 100644
--- a/chrome/browser/views/options/content_page_view.h
+++ b/chrome/browser/views/options/content_page_view.h
@@ -27,7 +27,7 @@ class PrefService;
 // ContentPageView
 
 class ContentPageView : public OptionsPageView,
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
                         public views::LinkController,
                         public ProfileSyncServiceObserver,
 #endif
@@ -46,7 +46,7 @@ class ContentPageView : public OptionsPageView,
   // ConfirmMessageBoxObserver implementation.
   virtual void OnConfirmMessageAccept();
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
 #endif
@@ -60,7 +60,7 @@ class ContentPageView : public OptionsPageView,
   virtual void Layout();
 
  private:
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   // Updates various sync controls based on the current sync state.
   void UpdateSyncControls();
 
@@ -78,7 +78,7 @@ class ContentPageView : public OptionsPageView,
   void InitFormAutofillGroup();
   void InitBrowsingDataGroup();
   void InitThemesGroup();
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   void InitSyncGroup();
 #endif
 
@@ -104,7 +104,7 @@ class ContentPageView : public OptionsPageView,
   views::NativeButton* import_button_;
   views::NativeButton* clear_data_button_;
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   // Controls for the Sync group.
   OptionsGroupView* sync_group_;
   views::Label* sync_status_label_;
@@ -116,7 +116,7 @@ class ContentPageView : public OptionsPageView,
   BooleanPrefMember ask_to_save_form_autofill_;
   StringPrefMember is_using_default_theme_;
 
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   // Cached pointer to ProfileSyncService, if it exists. Kept up to date
   // and NULL-ed out on destruction.
   ProfileSyncService* sync_service_;
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 0ec9557..42e2f531 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -1132,7 +1132,7 @@ void ToolbarView::CreateAppMenu() {
   }
 
   app_menu_contents_->AddSeparator();
-#ifdef CHROME_PERSONALIZATION
+#if defined(BROWSER_SYNC)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableSync)) {
     std::wstring label;
     std::wstring link;