Remove the browser_sync flag.

chrome/browser/views/bookmark_manager_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_MANAGER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_
 
 #include "base/keyboard_codes.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
@@ skipping 26 matching lines @@
 // text field is also provided that allows the user to search the contents
 // of the bookmarks.
 class BookmarkManagerView : public views::View,
                             public views::ContextMenuController,
                             public views::MenuDelegate,
                             public views::TableViewObserver,
                             public views::Textfield::Controller,
                             public views::TreeViewController,
                             public views::ViewMenuDelegate,
                             public views::WindowDelegate,
-#if defined(BROWSER_SYNC)
                             public views::ButtonListener,
                             public ProfileSyncServiceObserver,
-#endif
                             public BookmarkModelObserver,
                             public SelectFileDialog::Listener {
  public:
   enum CutCopyPasteType {
     CUT,
     COPY,
     PASTE,
     NONE
   };
 
@@ skipping 27 matching lines @@
   virtual bool CanResize() const { return true; }
   virtual bool CanMaximize() const { return true; }
   virtual std::wstring GetWindowTitle() const;
   virtual std::wstring GetWindowName() const;
   virtual View* GetContentsView() { return this; }
   // TODO(sky): implement these when we have an icon.
   //virtual SkBitmap GetWindowIcon();
   //virtual bool ShouldShowWindowIcon() const { return true; }
   virtual void WindowClosing();
 
-#if defined(BROWSER_SYNC)
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
-#endif
 
   Profile* profile() const { return profile_; }
 
  protected:
   // View methods.
   virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
 
  private:
   // TableViewObserver methods.
   virtual void OnSelectionChanged() {}
   // Overriden to open the selected table nodes in the current browser.
   virtual void OnDoubleClick();
   virtual void OnMiddleClick();
   virtual void OnTableViewDelete(views::TableView* table);
   virtual void OnKeyDown(base::KeyboardCode keycode);
 
   // TreeViewController methods.
   virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view);
   virtual void OnTreeViewKeyDown(base::KeyboardCode keycode);
 
-#if defined(BROWSER_SYNC)
   // views::ButtonListener method.
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
-#endif
 
   // BookmarkModelObserver. We're only installed as an observer until the
   // bookmarks are loaded.
   virtual void Loaded(BookmarkModel* model);
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) {}
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
                                  int new_index) {}
@@ skipping 71 matching lines @@
   void OnCutCopyPaste(CutCopyPasteType type, bool from_table);
 
   // Shows the tools menu.
   void ShowToolsMenu(int x, int y);
 
   // Shows the import/export file chooser. These invoke
   // FileSelected/FileSelectionCanceled when done.
   void ShowImportBookmarksFileChooser();
   void ShowExportBookmarksFileChooser();
 
-#if defined(BROWSER_SYNC)
   void UpdateSyncStatus();
   void OpenSyncMyBookmarksDialog();
-#endif
 
   Profile* profile_;
   BookmarkTableView* table_view_;
   BookmarkFolderTreeView* tree_view_;
   scoped_ptr<BookmarkTableModel> table_model_;
   scoped_ptr<BookmarkFolderTreeModel> tree_model_;
   views::Textfield* search_tf_;
   views::SingleSplitView* split_view_;
 
   // Import/export file dialog.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
-#if defined(BROWSER_SYNC)
   // The sync status button that notifies the user about the current status of
   // bookmarks synchronization.
   views::TextButton* sync_status_button_;
 
   // A pointer to the ProfileSyncService instance if one exists.
   ProfileSyncService* sync_service_;
-#endif
 
   // Factory used for delaying search.
   ScopedRunnableMethodFactory<BookmarkManagerView> search_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkManagerView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_MANAGER_VIEW_H_