[protector] Support for collapsing multiple changes into a single one.

chrome/browser/protector/prefs_backup_invalid_change.cc

 // Copyright (c) 2012 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
@@ skipping 22 matching lines @@
   virtual void Apply(Browser* browser) OVERRIDE;
   virtual void Discard(Browser* browser) OVERRIDE;
   virtual void Timeout() OVERRIDE;
   virtual int GetBadgeIconID() const OVERRIDE;
   virtual int GetMenuItemIconID() const OVERRIDE;
   virtual int GetBubbleIconID() const OVERRIDE;
   virtual string16 GetBubbleTitle() const OVERRIDE;
   virtual string16 GetBubbleMessage() const OVERRIDE;
   virtual string16 GetApplyButtonText() const OVERRIDE;
   virtual string16 GetDiscardButtonText() const OVERRIDE;
+  virtual bool CanBeMerged() const OVERRIDE;
 
  private:
   virtual ~PrefsBackupInvalidChange();
 
   // Applies default settings values when appropriate.
   void ApplyDefaults(Profile* profile);
 
   // True if session startup prefs have been reset.
   bool startup_pref_reset_;
 
@@ skipping 40 matching lines @@
 
 int PrefsBackupInvalidChange::GetMenuItemIconID() const {
   return IDR_UPDATE_MENU4;
 }
 
 int PrefsBackupInvalidChange::GetBubbleIconID() const {
   return IDR_INPUT_ALERT;
 }
 
 string16 PrefsBackupInvalidChange::GetBubbleTitle() const {
-  return l10n_util::GetStringUTF16(IDS_SETTING_CHANGE_NO_BACKUP_TITLE);
+  return l10n_util::GetStringUTF16(IDS_SETTING_CHANGE_TITLE);
 }
 
 string16 PrefsBackupInvalidChange::GetBubbleMessage() const {
   return startup_pref_reset_ ?
       l10n_util::GetStringUTF16(
           IDS_SETTING_CHANGE_NO_BACKUP_STARTUP_RESET_BUBBLE_MESSAGE) :
-      l10n_util::GetStringUTF16(IDS_SETTING_CHANGE_NO_BACKUP_BUBBLE_MESSAGE);
+      l10n_util::GetStringUTF16(IDS_SETTING_CHANGE_BUBBLE_MESSAGE);
 }
 
 string16 PrefsBackupInvalidChange::GetApplyButtonText() const {
   // Don't show this button.
   return string16();
 }
 
 string16 PrefsBackupInvalidChange::GetDiscardButtonText() const {
   return l10n_util::GetStringUTF16(IDS_EDIT_SETTINGS);
 }
 
 void PrefsBackupInvalidChange::ApplyDefaults(Profile* profile) {
   PrefService* prefs = profile->GetPrefs();
   SessionStartupPref startup_pref = SessionStartupPref::GetStartupPref(prefs);
   if (startup_pref.type != SessionStartupPref::LAST) {
     // If startup type is LAST, resetting it is dangerous (the whole previous
     // session will be lost).
     startup_pref.type = SessionStartupPref::GetDefaultStartupType();
     SessionStartupPref::SetStartupPref(prefs, startup_pref);
     startup_pref_reset_ = true;
   }
 }
 
+bool PrefsBackupInvalidChange::CanBeMerged() const {
+  return false;
+}
+
 BaseSettingChange* CreatePrefsBackupInvalidChange() {
   return new PrefsBackupInvalidChange();
 }
 
 }  // namespace protector