Switch Protector to the new icons.

chrome/browser/protector/settings_change_global_error.cc

 // Copyright (c) 2011 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"
@@ skipping 29 matching lines @@
   DCHECK(delegate_);
 }
 
 SettingsChangeGlobalError::~SettingsChangeGlobalError() {
 }
 
 bool SettingsChangeGlobalError::HasBadge() {
   return true;
 }
 
+int SettingsChangeGlobalError::GetBadgeResourceID() {
+  return change_->GetBadgeIconID();
+}
+
 bool SettingsChangeGlobalError::HasMenuItem() {
   return true;
 }
 
 int SettingsChangeGlobalError::MenuItemCommandID() {
   return IDC_SHOW_SETTINGS_CHANGES;
 }
 
 string16 SettingsChangeGlobalError::MenuItemLabel() {
   return change_->GetBubbleTitle();
 }
 
+int SettingsChangeGlobalError::MenuItemIconResourceID() {
+  return change_->GetMenuItemIconID();
+}
+
 void SettingsChangeGlobalError::ExecuteMenuItem(Browser* browser) {
   // Cancel previously posted tasks.
   weak_factory_.InvalidateWeakPtrs();
   browser_ = browser;
   ShowBubbleView(browser_);
 }
 
 bool SettingsChangeGlobalError::HasBubbleView() {
   return true;
 }
 
+int SettingsChangeGlobalError::GetBubbleViewIconResourceID() {
+  return change_->GetBubbleIconID();
+}
+
 string16 SettingsChangeGlobalError::GetBubbleViewTitle() {
   return change_->GetBubbleTitle();
 }
 
 string16 SettingsChangeGlobalError::GetBubbleViewMessage() {
   return change_->GetBubbleMessage();
 }
 
 // The Accept and Revert buttons are swapped like the 'server' and 'client'
 // concepts in X11. Accept button (the default one) discards changes
@@ skipping 63 matching lines @@
   if (browser_)
     ShowBubbleView(browser_);
 }
 
 void SettingsChangeGlobalError::OnInactiveTimeout() {
   delegate_->OnDecisionTimeout();
   RemoveFromProfile();
 }
 
 }  // namespace protector