Remove the browser_sync flag.

chrome/browser/views/options/content_page_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/options/content_page_view.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 18 matching lines @@
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 namespace {
 
 const int kPasswordSavingRadioGroup = 1;
 const int kFormAutofillRadioGroup = 2;
 
-#if defined(BROWSER_SYNC)
 // Background color for the status label when it's showing an error.
 static const SkColor kSyncLabelErrorBgColor = SkColorSetRGB(0xff, 0x9a, 0x9a);
 
 static views::Background* CreateErrorBackground() {
   return views::Background::CreateSolidBackground(kSyncLabelErrorBgColor);
 }
-#endif
+
 }  // namespace
 
 ContentPageView::ContentPageView(Profile* profile)
     : passwords_exceptions_button_(NULL),
       passwords_group_(NULL),
       passwords_asktosave_radio_(NULL),
       passwords_neversave_radio_(NULL),
       form_autofill_asktosave_radio_(NULL),
       form_autofill_neversave_radio_(NULL),
       themes_group_(NULL),
       themes_reset_button_(NULL),
       themes_gallery_link_(NULL),
       browsing_data_label_(NULL),
       browsing_data_group_(NULL),
       import_button_(NULL),
       clear_data_button_(NULL),
-#if defined(BROWSER_SYNC)
       sync_group_(NULL),
       sync_status_label_(NULL),
       sync_action_link_(NULL),
       sync_start_stop_button_(NULL),
       sync_service_(NULL),
-#endif
       OptionsPageView(profile) {
-#if defined(BROWSER_SYNC)
   if (profile->GetProfileSyncService()) {
     sync_service_ = profile->GetProfileSyncService();
     sync_service_->AddObserver(this);
-#endif
   }
 }
 
 ContentPageView::~ContentPageView() {
-#if defined(BROWSER_SYNC)
   if (sync_service_)
     sync_service_->RemoveObserver(this);
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentPageView, views::ButtonListener implementation:
 
 void ContentPageView::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   if (sender == passwords_asktosave_radio_ ||
       sender == passwords_neversave_radio_) {
     bool enabled = passwords_asktosave_radio_->checked();
@@ skipping 25 matching lines @@
   } else if (sender == import_button_) {
     views::Window::CreateChromeWindow(
       GetWindow()->GetNativeWindow(),
       gfx::Rect(),
       new ImporterView(profile()))->Show();
   } else if (sender == clear_data_button_) {
     views::Window::CreateChromeWindow(
       GetWindow()->GetNativeWindow(),
       gfx::Rect(),
       new ClearBrowsingDataView(profile()))->Show();
-#if defined(BROWSER_SYNC)
   } else if (sender == sync_start_stop_button_) {
     DCHECK(sync_service_);
 
     if (sync_service_->HasSyncSetupCompleted()) {
       ConfirmMessageBoxDialog::RunWithCustomConfiguration(
           GetWindow()->GetNativeWindow(),
           this,
           l10n_util::GetString(IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL),
           l10n_util::GetString(IDS_SYNC_STOP_SYNCING_BUTTON_LABEL),
           l10n_util::GetString(IDS_SYNC_STOP_SYNCING_CONFIRM_BUTTON_LABEL),
           l10n_util::GetString(IDS_CANCEL),
           gfx::Size(views::Window::GetLocalizedContentsSize(
               IDS_CONFIRM_STOP_SYNCING_DIALOG_WIDTH_CHARS,
               IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES)));
       return;
     } else {
       sync_service_->EnableForUser();
       ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_OPTIONS);
     }
-#endif
   }
 }
 
 void ContentPageView::LinkActivated(views::Link* source, int event_flags) {
   if (source == themes_gallery_link_) {
     UserMetricsRecordAction(L"Options_ThemesGallery", profile()->GetPrefs());
     Browser* browser = BrowserList::GetLastActive();
     browser->OpenURL(GURL(l10n_util::GetString(IDS_THEMES_GALLERY_URL)),
                      GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
     browser->window()->Activate();
     return;
   }
-#if defined(BROWSER_SYNC)
   DCHECK_EQ(source, sync_action_link_);
   DCHECK(sync_service_);
   sync_service_->ShowLoginDialog();
-#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ContentPageView, OptionsPageView implementation:
 
 void ContentPageView::InitControlLayout() {
   using views::GridLayout;
   using views::ColumnSet;
 
   GridLayout* layout = new GridLayout(this);
   layout->SetInsets(5, 5, 5, 5);
   SetLayoutManager(layout);
 
   const int single_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
-#if defined(BROWSER_SYNC)
   if (sync_service_) {
     layout->StartRow(0, single_column_view_set_id);
     InitSyncGroup();
     layout->AddView(sync_group_);
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   }
-#endif
 
   layout->StartRow(0, single_column_view_set_id);
   InitPasswordSavingGroup();
   layout->AddView(passwords_group_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   InitFormAutofillGroup();
   layout->AddView(form_autofill_group_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
@@ skipping 35 matching lines @@
   if (!pref_name || *pref_name == prefs::kCurrentThemeID) {
     themes_reset_button_->SetEnabled(
         is_using_default_theme_.GetValue().length() > 0);
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentsPageView, views::View overrides:
 
 void ContentPageView::Layout() {
-#if defined(BROWSER_SYNC)
   if (is_initialized())
     UpdateSyncControls();
-#endif
   // We need to Layout twice - once to get the width of the contents box...
   View::Layout();
   passwords_asktosave_radio_->SetBounds(
       0, 0, passwords_group_->GetContentsWidth(), 0);
   passwords_neversave_radio_->SetBounds(
       0, 0, passwords_group_->GetContentsWidth(), 0);
   browsing_data_label_->SetBounds(
       0, 0, browsing_data_group_->GetContentsWidth(), 0);
-#if defined(BROWSER_SYNC)
   if (is_initialized()) {
     sync_status_label_->SetBounds(
         0, 0, sync_group_->GetContentsWidth(), 0);
   }
-#endif
   // ... and twice to get the height of multi-line items correct.
   View::Layout();
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentsPageView, ProfileSyncServiceObserver implementation:
-#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
   // clicked.
   if (is_initialized())
     Layout();
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // ContentPageView, private:
 
 void ContentPageView::InitPasswordSavingGroup() {
   passwords_asktosave_radio_ = new views::RadioButton(
       l10n_util::GetString(IDS_OPTIONS_PASSWORDS_ASKTOSAVE),
       kPasswordSavingRadioGroup);
   passwords_asktosave_radio_->set_listener(this);
   passwords_asktosave_radio_->SetMultiLine(true);
@@ skipping 140 matching lines @@
   browsing_data_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_OPTIONS_BROWSING_DATA_GROUP_NAME),
       L"", true);
 }
 
 void ContentPageView::OnConfirmMessageAccept() {
   sync_service_->DisableForUser();
   ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
 }
 
-#if defined(BROWSER_SYNC)
 void ContentPageView::InitSyncGroup() {
   sync_status_label_ = new views::Label;
   sync_status_label_->SetMultiLine(true);
   sync_status_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
   sync_action_link_ = new views::Link();
   sync_action_link_->set_collapse_when_hidden(true);
   sync_action_link_->SetController(this);
 
   sync_start_stop_button_ = new views::NativeButton(this, std::wstring());
@@ skipping 43 matching lines @@
   sync_action_link_->SetText(link_label);
   sync_action_link_->SetVisible(!link_label.empty());
   if (status_has_error) {
     sync_status_label_->set_background(CreateErrorBackground());
     sync_action_link_->set_background(CreateErrorBackground());
   } else {
     sync_status_label_->set_background(NULL);
     sync_action_link_->set_background(NULL);
   }
 }
-
-#endif  // defined(BROWSER_SYNC)