ProtectorService supports multiple change instances.

chrome/browser/protector/settings_change_global_error.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 "chrome/browser/protector/settings_change_global_error.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/protector/base_setting_change.h"
 #include "chrome/browser/protector/settings_change_global_error_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace protector {
 
 namespace {
 
 // Timeout before the global error is removed (wrench menu item disappears).
 const int kMenuItemDisplayPeriodMs = 10*60*1000;  // 10 min
 
 }  // namespace
 
+// static
+std::bitset<IDC_SHOW_SETTINGS_CHANGE_LAST -
+            IDC_SHOW_SETTINGS_CHANGE_FIRST + 1>
+    SettingsChangeGlobalError::menu_ids_;
+
 SettingsChangeGlobalError::SettingsChangeGlobalError(
     BaseSettingChange* change,
     SettingsChangeGlobalErrorDelegate* delegate)
     : change_(change),
       delegate_(delegate),
       profile_(NULL),
       closed_by_button_(false),
       show_on_browser_activation_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      menu_id_(-1) {
   DCHECK(delegate_);
+  for (int i = IDC_SHOW_SETTINGS_CHANGE_FIRST;
+       i <= IDC_SHOW_SETTINGS_CHANGE_LAST; i++) {
+    if (!menu_ids_[i - IDC_SHOW_SETTINGS_CHANGE_FIRST]) {
+      menu_id_ = i;
+      menu_ids_.set(i - IDC_SHOW_SETTINGS_CHANGE_FIRST);
+      break;
+    }
+  }
+  DCHECK(menu_id_ >= 0) << "Out of command IDs for SettingsChangeGlobalError";
 }
 
 SettingsChangeGlobalError::~SettingsChangeGlobalError() {
+  if (profile_)
+    RemoveFromProfile();
+  if (menu_id_ >= 0)
+    menu_ids_.reset(menu_id_ - IDC_SHOW_SETTINGS_CHANGE_FIRST);
 }
 
 bool SettingsChangeGlobalError::HasBadge() {
   return true;
 }
 
 int SettingsChangeGlobalError::GetBadgeResourceID() {
   return change_->GetBadgeIconID();
 }
 
 bool SettingsChangeGlobalError::HasMenuItem() {
   return true;
 }
 
 int SettingsChangeGlobalError::MenuItemCommandID() {
-  return IDC_SHOW_SETTINGS_CHANGES;
+  return menu_id_;
 }
 
 string16 SettingsChangeGlobalError::MenuItemLabel() {
   return change_->GetBubbleTitle();
 }
 
 int SettingsChangeGlobalError::MenuItemIconResourceID() {
   return change_->GetMenuItemIconID();
 }
 
@@ skipping 26 matching lines @@
   return change_->GetDiscardButtonText();
 }
 
 string16 SettingsChangeGlobalError::GetBubbleViewCancelButtonLabel() {
   return change_->GetApplyButtonText();
 }
 
 void SettingsChangeGlobalError::BubbleViewAcceptButtonPressed(
     Browser* browser) {
   closed_by_button_ = true;
-  delegate_->OnDiscardChange(browser);
+  delegate_->OnDiscardChange(this, browser);
 }
 
 void SettingsChangeGlobalError::BubbleViewCancelButtonPressed(
     Browser* browser) {
   closed_by_button_ = true;
-  delegate_->OnApplyChange(browser);
+  delegate_->OnApplyChange(this, browser);
 }
 
 void SettingsChangeGlobalError::OnBrowserSetLastActive(
     const Browser* browser) {
   if (show_on_browser_activation_ && browser && browser->is_type_tabbed()) {
     // A tabbed browser window got activated, show the error bubble again.
     // Calling Show() immediately from here does not always work because the
     // old browser window may still have focus.
     // Multiple posted Show() calls are fine since the first successful one
     // will invalidate all the weak pointers.
     // Note that Show() will display the bubble in the last active browser
     // (which may not be |browser| at the moment Show() is executed).
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&SettingsChangeGlobalError::Show,
                    weak_factory_.GetWeakPtr()));
   }
 }
 
 void SettingsChangeGlobalError::RemoveFromProfile() {
-  if (profile_)
+  if (profile_) {
     GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(this);
+    profile_ = NULL;
+  }
   BrowserList::RemoveObserver(this);
   // This will delete |this|.
-  delegate_->OnRemovedFromProfile();
+  delegate_->OnRemovedFromProfile(this);
 }
 
 void SettingsChangeGlobalError::OnBubbleViewDidClose(Browser* browser) {
   if (!closed_by_button_) {
     BrowserThread::PostDelayedTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&SettingsChangeGlobalError::OnInactiveTimeout,
                    weak_factory_.GetWeakPtr()),
         kMenuItemDisplayPeriodMs);
+#if !defined(TOOLKIT_GTK)

[Ivan Korotkov, 2012/02/29 16:57:41]

Disregard that, please (comes from a different CL).

+    // TODO(ivankr): the logic for redisplaying bubble is disabled on Gtk, see
+    // http://crbug.com/115719.
     if (browser->window() &&
         !platform_util::IsWindowActive(browser->window()->GetNativeHandle())) {
       // Bubble closed because the entire window lost activation, display
       // again when a window gets active.
       show_on_browser_activation_ = true;
     }
+#endif
   } else {
     RemoveFromProfile();
   }
 }
 
 void SettingsChangeGlobalError::ShowForProfile(Profile* profile) {
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     AddToProfile(profile);
   } else {
     BrowserThread::PostTask(
@@ skipping 25 matching lines @@
 
 void SettingsChangeGlobalError::ShowInBrowser(Browser* browser) {
   show_on_browser_activation_ = false;
   // Cancel any previously posted tasks so that the global error
   // does not get removed on timeout while still showing the bubble.
   weak_factory_.InvalidateWeakPtrs();
   ShowBubbleView(browser);
 }
 
 void SettingsChangeGlobalError::OnInactiveTimeout() {
-  delegate_->OnDecisionTimeout();
+  delegate_->OnDecisionTimeout(this);
   RemoveFromProfile();
 }
 
 }  // namespace protector