Revert "Password bubble: Add an "active" icon state, and a new disabled icon."

chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc

 // Copyright 2013 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/ui/views/passwords/manage_passwords_icon_view.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/view_ids.h"
@@ skipping 23 matching lines @@
     tooltip_text_id_ = 0;
 
     SetVisible(false);
     if (ManagePasswordsBubbleView::IsShowing())
       ManagePasswordsBubbleView::CloseBubble();
     return;
   }
 
   // Otherwise, start with the correct values for MANAGE_STATE, and adjust
   // things accordingly if we're either in BLACKLIST_STATE or PENDING_STATE.
-  icon_id_ = active() ? IDR_SAVE_PASSWORD_ACTIVE : IDR_SAVE_PASSWORD_INACTIVE;
+  icon_id_ = IDR_SAVE_PASSWORD;
   tooltip_text_id_ = IDS_PASSWORD_MANAGER_TOOLTIP_MANAGE;
   if (state() == password_manager::ui::BLACKLIST_STATE)
-    icon_id_ = active() ? IDR_SAVE_PASSWORD_DISABLED_ACTIVE
-                        : IDR_SAVE_PASSWORD_DISABLED_INACTIVE;
+    icon_id_ = IDR_SAVE_PASSWORD_BLACKLISTED;
   else if (password_manager::ui::IsPendingState(state()))
     tooltip_text_id_ = IDS_PASSWORD_MANAGER_TOOLTIP_SAVE;
 
   SetVisible(true);
   SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon_id_));
   SetTooltipText(l10n_util::GetStringUTF16(tooltip_text_id_));
 
   if (password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE) {
     // We're about the automatically pop up a ManagePasswordsBubbleView.
     // Force layout of the icon's parent now; the bubble will be incorrectly
     // positioned otherwise, as the icon won't have been drawn into position.
     parent()->Layout();
   }
 }
 
 bool ManagePasswordsIconView::IsBubbleShowing() const {
   return ManagePasswordsBubbleView::IsShowing();
 }
 
 void ManagePasswordsIconView::OnExecuting(
     BubbleIconView::ExecuteSource source) {
 }