| 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 9e08df87e1308c5fc2ff50332ea22d01ac7a18d2..016be0f76a5c5ad4748719b75f18f28e0a886cc7 100644
|
| --- a/chrome/browser/protector/settings_change_global_error.h
|
| +++ b/chrome/browser/protector/settings_change_global_error.h
|
| @@ -13,26 +13,17 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/string16.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "chrome/browser/protector/protector.h"
|
| #include "chrome/browser/ui/global_error.h"
|
|
|
| +class Browser;
|
| class Profile;
|
|
|
| +namespace protector {
|
| +
|
| // Global error about unwanted settings changes.
|
| class SettingsChangeGlobalError : public GlobalError {
|
| public:
|
| - enum ChangeType {
|
| - kSearchEngineChanged = 0, // Default search engine has been changed.
|
| - kHomePageChanged, // Home page has been changed.
|
| - };
|
| -
|
| - struct Change {
|
| - ChangeType type; // Which setting has been changed.
|
| - string16 old_setting; // Old setting value or "" if unknown.
|
| - string16 new_setting; // New setting value.
|
| - };
|
| -
|
| - typedef std::vector<Change> ChangesVector;
|
| -
|
| // Creates new global error about settings changes |changes|.
|
| // If user decides to apply changes, |apply_changes_cb| is called.
|
| // If user decides to keep previous settings, |revert_changes_cb| is called.
|
| @@ -45,6 +36,9 @@ class SettingsChangeGlobalError : public GlobalError {
|
| // Can be called from any thread.
|
| void ShowForDefaultProfile();
|
|
|
| + Profile* profile() const { return profile_; }
|
| + Browser* browser() const { return browser_; }
|
| +
|
| // GlobalError implementation.
|
| virtual bool HasBadge() OVERRIDE;
|
| virtual bool HasMenuItem() OVERRIDE;
|
| @@ -62,7 +56,7 @@ class SettingsChangeGlobalError : public GlobalError {
|
| virtual void BubbleViewCancelButtonPressed() OVERRIDE;
|
|
|
| private:
|
| - ChangesVector changes_;
|
| + Protector::ChangesVector changes_;
|
|
|
| base::Closure apply_changes_cb_;
|
| base::Closure revert_changes_cb_;
|
| @@ -70,6 +64,9 @@ class SettingsChangeGlobalError : public GlobalError {
|
| // Profile that we have been added to.
|
| Profile* profile_;
|
|
|
| + // Browser that we have been shown for.
|
| + Browser* browser_;
|
| +
|
| // True if user has dismissed the bubble by clicking on one of the buttons.
|
| bool closed_by_button_;
|
|
|
| @@ -88,4 +85,6 @@ class SettingsChangeGlobalError : public GlobalError {
|
| DISALLOW_COPY_AND_ASSIGN(SettingsChangeGlobalError);
|
| };
|
|
|
| +} // namespace protector
|
| +
|
| #endif // CHROME_BROWSER_PROTECTOR_SETTINGS_CHANGE_GLOBAL_ERROR_H_
|
|
|