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

chrome/browser/protector/default_search_provider_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 <algorithm>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 79 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 DisplayName GetApplyDisplayName() const OVERRIDE;
+  virtual GURL GetNewSettingURL() const OVERRIDE;
 
  private:
   virtual ~DefaultSearchProviderChange();
 
   // TemplateURLServiceObserver overrides:
   virtual void OnTemplateURLServiceChanged() OVERRIDE;
 
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
@@ skipping 205 matching lines @@
   if (!is_fallback_) {
     string16 name = default_search_provider_->short_name();
     return (name.length() > kMaxDisplayedNameLength) ?
         l10n_util::GetStringUTF16(IDS_KEEP_SETTING) :
         l10n_util::GetStringFUTF16(IDS_KEEP_SEARCH_ENGINE, name);
   }
   // Old setting is lost, offer to go to settings.
   return l10n_util::GetStringUTF16(IDS_SELECT_SEARCH_ENGINE);
 }
 
+BaseSettingChange::DisplayName
+DefaultSearchProviderChange::GetApplyDisplayName() const {
+  if (new_search_provider_ &&
+      new_search_provider_->short_name().length() <= kMaxDisplayedNameLength) {
+    return DisplayName(kDefaultSearchProviderChangeNamePriority,
+                       new_search_provider_->short_name());
+  }
+  // Return the default empty name.
+  return BaseSettingChange::GetApplyDisplayName();
+}
+
+GURL DefaultSearchProviderChange::GetNewSettingURL() const {
+  if (is_fallback_) {
+    // Do not collide this change when fallback was made, since the message
+    // and Discard behaviour is pretty different.
+    return GURL();
+  }
+  if (!new_search_provider_)
+    return GURL();
+  return TemplateURLService::GenerateSearchURL(new_search_provider_);
+}
+
 void DefaultSearchProviderChange::OnTemplateURLServiceChanged() {
   TemplateURLService* url_service = GetTemplateURLService();
   if (url_service->GetDefaultSearchProvider() != default_search_provider_) {
     VLOG(1) << "Default search provider has been changed by user";
     default_search_provider_ = NULL;
     url_service->RemoveObserver(this);
     // Will delete this DefaultSearchProviderChange instance.
     ProtectorServiceFactory::GetForProfile(profile())->DismissChange(this);
   }
 }
@@ skipping 56 matching lines @@
   DCHECK(url_service);
   return url_service;
 }
 
 BaseSettingChange* CreateDefaultSearchProviderChange(const TemplateURL* actual,
                                                      TemplateURL* backup) {
   return new DefaultSearchProviderChange(actual, backup);
 }
 
 }  // namespace protector