Protector strings and bubble/SettingsChange code refactoring.

chrome/browser/protector/settings_change_global_error.h

Index: chrome/browser/protector/settings_change_global_error.h
diff --git a/chrome/browser/protector/settings_change_global_error.h b/chrome/browser/protector/settings_change_global_error.h
index ea4102232faba9ecb0791f28d8ee706ea29d7a98..315de7f1a0784aa3c144ca1503708590b0be84a2 100644
--- a/chrome/browser/protector/settings_change_global_error.h
+++ b/chrome/browser/protector/settings_change_global_error.h
@@ -8,6 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/protector/setting_change.h"
 #include "chrome/browser/ui/global_error.h"
@@ -22,12 +23,10 @@ class SettingsChangeGlobalErrorDelegate;
 // Global error about unwanted settings changes.
 class SettingsChangeGlobalError : public GlobalError {
  public:
-  // Creates new global error about settings changes |changes|. Takes
-  // ownership over |changes| contents.
-  // Uses |delegate| to notify about user decision.
-  SettingsChangeGlobalError(
-      const SettingChangeVector& changes,
-      SettingsChangeGlobalErrorDelegate* delegate);
+  // Creates new global error about setting changes |change| and takes
+  // ownership over it. Uses |delegate| to notify about user decision.
+  SettingsChangeGlobalError(SettingChange* change,
+                            SettingsChangeGlobalErrorDelegate* delegate);
   virtual ~SettingsChangeGlobalError();
 
   // Displays a global error bubble for the given browser profile.
@@ -37,7 +36,7 @@ class SettingsChangeGlobalError : public GlobalError {
   // Browser that the bubble has been last time shown for.
   Browser* browser() const { return browser_; }
 
-  SettingChangeVector* mutable_changes() { return &changes_; }
+  SettingChange* change() { return change_.get(); }

[whywhat, 2011/11/18 08:18:20]

Should be mutable_change() since the returned pointer is non-const.

[Ivan Korotkov, 2011/11/18 10:44:25]

Done.

 
   // GlobalError implementation.
   virtual bool HasBadge() OVERRIDE;
@@ -65,8 +64,8 @@ class SettingsChangeGlobalError : public GlobalError {
   // Removes global error from its profile and deletes |this| later.
   void RemoveFromProfile();
 
-  // List of changes to show.
-  SettingChangeVector changes_;
+  // Change to show.
+  scoped_ptr<SettingChange> change_;
 
   // Delegate to notify about user actions.
   SettingsChangeGlobalErrorDelegate* delegate_;