Remove the browser_sync flag.

chrome/browser/views/bookmark_bar_view.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
 
 #include "app/slide_animation.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
@@ skipping 18 matching lines @@
 }
 
 // BookmarkBarView renders the BookmarkModel.  Each starred entry on the
 // BookmarkBar is rendered as a MenuButton. An additional MenuButton aligned to
 // the right allows the user to quickly see recently starred entries.
 //
 // BookmarkBarView shows the bookmarks from a specific Profile. BookmarkBarView
 // waits until the HistoryService for the profile has been loaded before
 // creating the BookmarkModel.
 class BookmarkBarView : public DetachableToolbarView,
-#if defined(BROWSER_SYNC)
                         public ProfileSyncServiceObserver,
-#endif
                         public BookmarkModelObserver,
                         public views::ViewMenuDelegate,
                         public views::ButtonListener,
                         public NotificationObserver,
                         public views::ContextMenuController,
                         public views::DragController,
                         public AnimationDelegate,
                         public BookmarkMenuController::Observer {
   friend class ShowFolderMenuTask;
 
@@ skipping 59 matching lines @@
   virtual bool AreDropTypesRequired();
   virtual bool CanDrop(const OSExchangeData& data);
   virtual void OnDragEntered(const views::DropTargetEvent& event);
   virtual int OnDragUpdated(const views::DropTargetEvent& event);
   virtual void OnDragExited();
   virtual int OnPerformDrop(const views::DropTargetEvent& event);
   virtual bool GetAccessibleName(std::wstring* name);
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
   virtual void SetAccessibleName(const std::wstring& name);
 
-#if defined(BROWSER_SYNC)
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
-#endif
 
   // Called when fullscreen mode toggles on or off; this affects our layout.
   void OnFullscreenToggled(bool fullscreen);
 
   // Sets the model change listener to listener.
   void SetModelChangedListener(ModelChangedListener* listener) {
     model_changed_listener_ = listener;
   }
 
   // If the ModelChangedListener is listener, ModelChangeListener is set to
@@ skipping 276 matching lines @@
 
   // Updates the colors for all the child objects in the bookmarks bar.
   void UpdateColors();
 
   // This method computes the bounds for the bookmark bar items. If
   // |compute_bounds_only| = TRUE, the bounds for the items are just computed,
   // but are not set. This mode is used by GetPreferredSize() to obtain the
   // desired bounds. If |compute_bounds_only| = FALSE, the bounds are set.
   gfx::Size LayoutItems(bool compute_bounds_only);
 
-#if defined(BROWSER_SYNC)
   // Determines whether the sync error button should appear on the bookmarks
   // bar.
   bool ShouldShowSyncErrorButton();
 
   // Creates the sync error button and adds it as a child view.
   views::TextButton* CreateSyncErrorButton();
-#endif
+
   NotificationRegistrar registrar_;
 
   Profile* profile_;
 
   // Used for opening urls.
   PageNavigator* page_navigator_;
 
   // Model providing details as to the starred entries/groups that should be
   // shown. This is owned by the Profile.
   BookmarkModel* model_;
@@ skipping 12 matching lines @@
 
   // ModelChangeListener.
   ModelChangedListener* model_changed_listener_;
 
   // Task used to delay showing of the drop menu.
   ShowFolderDropMenuTask* show_folder_drop_menu_task_;
 
   // Used to track drops on the bookmark bar view.
   scoped_ptr<DropInfo> drop_info_;
 
-#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_;
 
   // A pointer to the ProfileSyncService instance if one exists.
   ProfileSyncService* sync_service_;
-#endif
 
   // Visible if not all the bookmark buttons fit.
   views::MenuButton* overflow_button_;
 
   // If no bookmarks are visible, we show some text explaining the bar.
   views::Label* instructions_;
 
   ButtonSeparatorView* bookmarks_separator_view_;
 
   // Owning browser. This is NULL during testing.
@@ skipping 13 matching lines @@
   // Background for extension toolstrips.
   SkBitmap toolstrip_background_;
 
   // Storage of strings needed for accessibility.
   std::wstring accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_