Remove the browser_sync flag.

chrome/browser/views/bookmark_manager_view.cc

 // 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.
 
 #include "chrome/browser/views/bookmark_manager_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
@@ skipping 147 matching lines @@
 void BookmarkManager::Show(Profile* profile) {
   BookmarkManagerView::Show(profile);
 }
 
 // -----------------------------------------------------------------------------
 
 BookmarkManagerView::BookmarkManagerView(Profile* profile)
     : profile_(profile->GetOriginalProfile()),
       table_view_(NULL),
       tree_view_(NULL),
-#if defined(BROWSER_SYNC)
       sync_status_button_(NULL),
       sync_service_(NULL),
-#endif
       ALLOW_THIS_IN_INITIALIZER_LIST(search_factory_(this)) {
   search_tf_ = new views::Textfield();
   search_tf_->set_default_width_in_chars(30);
 
   table_view_ = new BookmarkTableView(profile_, NULL);
   table_view_->SetObserver(this);
   table_view_->SetContextMenuController(this);
 
   tree_view_ = new BookmarkFolderTreeView(profile_, NULL);
   tree_view_->SetController(this);
@@ skipping 18 matching lines @@
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
   const int top_id = 1;
   const int split_cs_id = 2;
   layout->SetInsets(2, 0, 0, 0);  // 2px padding above content.
   views::ColumnSet* column_set = layout->AddColumnSet(top_id);
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                         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(BROWSER_SYNC)
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                         0, views::GridLayout::USE_PREF, 0, 0);
-#endif
   column_set->AddPaddingColumn(1, kUnrelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                         0, views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
                         0, views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, 3);  // 3px padding at end of row.
 
   column_set = layout->AddColumnSet(split_cs_id);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, top_id);
   layout->AddView(organize_menu_button);
   layout->AddView(tools_menu_button);
-#if defined(BROWSER_SYNC)
   sync_status_button_ = new views::TextButton(this, std::wstring());
   layout->AddView(sync_status_button_);
-#endif
   layout->AddView(new views::Label(
       l10n_util::GetString(IDS_BOOKMARK_MANAGER_SEARCH_TITLE)));
   layout->AddView(search_tf_);
 
   layout->AddPaddingRow(0, 3);  // 3px padding between rows.
 
   layout->StartRow(1, split_cs_id);
   layout->AddView(split_view_);
 
   // Press Ctrl-W to close bookmark manager window.
   AddAccelerator(views::Accelerator(base::VKEY_W, false, true, false));
 
   BookmarkModel* bookmark_model = profile_->GetBookmarkModel();
   if (!bookmark_model->IsLoaded())
     bookmark_model->AddObserver(this);
 
-#if defined(BROWSER_SYNC)
   if (profile->GetProfileSyncService()) {
     sync_service_ = profile_->GetProfileSyncService();
     sync_service_->AddObserver(this);
     UpdateSyncStatus();
   }
-#endif
 }
 
 BookmarkManagerView::~BookmarkManagerView() {
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
 
   if (!GetBookmarkModel()->IsLoaded()) {
     GetBookmarkModel()->RemoveObserver(this);
   } else {
     // The models are deleted before the views. Make sure we set the models of
     // the views to NULL so that they aren't left holding a reference to a
     // deleted model.
     table_view_->SetModel(NULL);
     tree_view_->SetModel(NULL);
   }
   manager = NULL;
   open_window = NULL;
 
-#if defined(BROWSER_SYNC)
   if (sync_service_)
     sync_service_->RemoveObserver(this);
-#endif
 }
 
 // static
 void BookmarkManagerView::Show(Profile* profile) {
   if (!profile->GetBookmarkModel())
     return;
 
   if (open_window != NULL) {
     open_window->Activate();
     return;
@@ skipping 88 matching lines @@
 
 std::wstring BookmarkManagerView::GetWindowName() const {
   return prefs::kBookmarkManagerPlacement;
 }
 
 void BookmarkManagerView::WindowClosing() {
   g_browser_process->local_state()->SetInteger(
       prefs::kBookmarkManagerSplitLocation, split_view_->divider_offset());
 }
 
-#if defined(BROWSER_SYNC)
 void BookmarkManagerView::OnStateChanged() {
   UpdateSyncStatus();
 }
-#endif
 
 bool BookmarkManagerView::AcceleratorPressed(
     const views::Accelerator& accelerator) {
   // Ctrl-W to close bookmark manager.
   DCHECK(accelerator.GetKeyCode() == 'W' && accelerator.IsCtrlDown());
   window()->Close();
   return true;
 }
 
 void BookmarkManagerView::OnDoubleClick() {
@@ skipping 113 matching lines @@
       GetBookmarkModel()->Remove(parent, parent->IndexOfChild(node));
       break;
     }
 
     default:
       OnCutCopyPaste(KeyCodeToCutCopyPaste(keycode), false);
       break;
   }
 }
 
-#if defined(BROWSER_SYNC)
 void BookmarkManagerView::ButtonPressed(views::Button* sender,
                                         const views::Event& event) {
   if (sender == sync_status_button_) {
     UserMetrics::RecordAction(L"BookmarkManager_Sync", profile_);
     OpenSyncMyBookmarksDialog();
   }
 }
-#endif
 
 void BookmarkManagerView::Loaded(BookmarkModel* model) {
   model->RemoveObserver(this);
   LoadedImpl();
 }
 
 void BookmarkManagerView::ContentsChanged(views::Textfield* sender,
                                           const std::wstring& new_contents) {
   search_factory_.RevokeAll();
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
@@ skipping 282 matching lines @@
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
   file_type_info.include_all_files = true;
   select_file_dialog_ = SelectFileDialog::Create(this);
   select_file_dialog_->SelectFile(
       SelectFileDialog::SELECT_SAVEAS_FILE, std::wstring(),
       FilePath(FILE_PATH_LITERAL("bookmarks.html")), &file_type_info, 0,
       L"html", GetWidget()->GetNativeView(),
       reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU));
 }
 
-#if defined(BROWSER_SYNC)
 void BookmarkManagerView::UpdateSyncStatus() {
   DCHECK(sync_service_);
   std::wstring status_label;
   std::wstring link_label;
   bool synced = SyncStatusUIHelper::GetLabels(sync_service_,
       &status_label, &link_label) == SyncStatusUIHelper::SYNCED;
 
   if (sync_service_->HasSyncSetupCompleted()) {
     std::wstring username = UTF16ToWide(
         sync_service_->GetAuthenticatedUsername());
     status_label = l10n_util::GetStringF(IDS_SYNC_NTP_SYNCED_TO, username);
   } else if (!sync_service_->SetupInProgress() && !synced) {
     status_label = l10n_util::GetString(IDS_SYNC_START_SYNC_BUTTON_LABEL);
   }
   sync_status_button_->SetText(status_label);
   sync_status_button_->GetParent()->Layout();
 }
 
 void BookmarkManagerView::OpenSyncMyBookmarksDialog() {
   if (!sync_service_)
     return;
   if (sync_service_->HasSyncSetupCompleted()) {
     ShowOptionsWindow(OPTIONS_PAGE_CONTENT, OPTIONS_GROUP_NONE, profile_);
   } else {
     sync_service_->EnableForUser();
     ProfileSyncService::SyncEvent(
         ProfileSyncService::START_FROM_BOOKMARK_MANAGER);
   }
 }
-#endif  // defined(BROWSER_SYNC)