Remove the browser_sync flag.

chrome/browser/gtk/bookmark_bar_gtk.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/gtk/bookmark_bar_gtk.h"
 
 #include <vector>
 
 #include "app/gfx/gtk_util.h"
 #include "app/gfx/canvas_paint.h"
@@ skipping 100 matching lines @@
                                Profile* profile, Browser* browser,
                                TabstripOriginProvider* tabstrip_origin_provider)
     : profile_(NULL),
       page_navigator_(NULL),
       browser_(browser),
       window_(window),
       tabstrip_origin_provider_(tabstrip_origin_provider),
       model_(NULL),
       instructions_label_(NULL),
       instructions_(NULL),
-#if defined(BROWSER_SYNC)
       sync_error_button_(NULL),
       sync_service_(NULL),
-#endif
       dragged_node_(NULL),
       toolbar_drop_item_(NULL),
       theme_provider_(GtkThemeProvider::GetFrom(profile)),
       show_instructions_(true),
       menu_bar_helper_(this),
       floating_(false),
       last_allocation_width_(-1),
       event_box_paint_factory_(this) {
-#if defined(BROWSER_SYNC)
   if (profile->GetProfileSyncService()) {
     // Obtain a pointer to the profile sync service and add our instance as an
     // observer.
     sync_service_ = profile->GetProfileSyncService();
     sync_service_->AddObserver(this);
   }
-#endif
 
   Init(profile);
   SetProfile(profile);
   // Force an update by simulating being in the wrong state.
   floating_ = !ShouldBeFloating();
   UpdateFloatingState();
 
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
 }
 
 BookmarkBarGtk::~BookmarkBarGtk() {
   if (model_)
     model_->RemoveObserver(this);
 
   RemoveAllBookmarkButtons();
   bookmark_toolbar_.Destroy();
   event_box_.Destroy();
 
-#if defined(BROWSER_SYNC)
   if (sync_service_)
     sync_service_->RemoveObserver(this);
-#endif
 }
 
 void BookmarkBarGtk::SetProfile(Profile* profile) {
   DCHECK(profile);
   if (profile_ == profile)
     return;
 
   RemoveAllBookmarkButtons();
 
   profile_ = profile;
@@ skipping 86 matching lines @@
                    G_CALLBACK(&OnToolbarDragLeave), this);
   g_signal_connect(bookmark_toolbar_.get(), "drag-data-received",
                    G_CALLBACK(&OnDragReceived), this);
 
   GtkWidget* vseparator = gtk_vseparator_new();
   gtk_box_pack_start(GTK_BOX(bookmark_hbox_), vseparator,
                      FALSE, FALSE, 0);
   g_signal_connect(vseparator, "expose-event",
                    G_CALLBACK(OnSeparatorExpose), this);
 
-#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_,
                      FALSE, FALSE, 0);
-#endif
 
   // We pack the button manually (rather than using gtk_button_set_*) so that
   // we can have finer control over its label.
   other_bookmarks_button_ = theme_provider_->BuildChromeButton();
   ConnectFolderButtonEvents(other_bookmarks_button_);
   gtk_box_pack_start(GTK_BOX(bookmark_hbox_), other_bookmarks_button_,
                      FALSE, FALSE, 0);
 
   gtk_widget_set_size_request(event_box_.get(), -1, kBookmarkBarMinimumHeight);
 
@@ skipping 44 matching lines @@
   // then force hide.
   if (slide_animation_->IsShowing() && animate) {
     slide_animation_->Hide();
   } else {
     gtk_widget_hide(bookmark_hbox_);
     slide_animation_->Reset(0);
     AnimationProgressed(slide_animation_.get());
   }
 }
 
-#if defined(BROWSER_SYNC)
 void BookmarkBarGtk::OnStateChanged() {
   // TODO(zork): TODO
 }
-#endif
 
 void BookmarkBarGtk::EnterFullscreen() {
   if (ShouldBeFloating())
     Show(false);
   else
     gtk_widget_hide(widget());
 }
 
 int BookmarkBarGtk::GetHeight() {
   return event_box_->allocation.height;
@@ skipping 912 matching lines @@
       break;
     }
   }
   DCHECK_NE(button_idx, -1);
 
   // Find the GtkWidget* for the actual target button.
   int shift = dir == GTK_MENU_DIR_PARENT ? -1 : 1;
   button_idx = (button_idx + shift + folder_list.size()) % folder_list.size();
   PopupForButton(folder_list[button_idx]);
 }