Facelifts to sync UI

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 110 matching lines @@
       gfx::Rect(),
       new ImporterView(profile()))->Show();
   } else if (sender == clear_data_button_) {
     views::Window::CreateChromeWindow(
       GetWindow()->GetNativeWindow(),
       gfx::Rect(),
       new ClearBrowsingDataView(profile()))->Show();
 #ifdef CHROME_PERSONALIZATION
   } else if (sender == sync_start_stop_button_) {
     DCHECK(sync_service_);
+
     if (sync_service_->HasSyncSetupCompleted()) {
-      sync_service_->DisableForUser();
-      ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
+      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_) {
@@ skipping 271 matching lines @@
                             GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(import_button_);
   layout->AddView(clear_data_button_);
 
   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);
+}
+
 #ifdef CHROME_PERSONALIZATION
 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);
 
@@ skipping 46 matching lines @@
   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