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

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

Index: chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
index 19b98dde0c73dc89aa27665384fc5aa80a6eb18a..27a9007badc0a627dde7d2637201833b6751f7c7 100644
--- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
+++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
@@ -373,10 +373,8 @@ void ManagePasswordsBubbleView::ShowBubble(content::WebContents* web_contents,
 
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
   bool is_fullscreen = browser_view->IsFullscreen();
-  ManagePasswordsIconView* anchor_view =
-      is_fullscreen
-          ? NULL
-          : browser_view->GetLocationBarView()->manage_passwords_icon_view();
+  views::View* anchor_view = is_fullscreen ?
+      NULL : browser_view->GetLocationBarView()->manage_passwords_icon_view();
   manage_passwords_bubble_ = new ManagePasswordsBubbleView(
       web_contents, anchor_view, reason);
 
@@ -392,6 +390,7 @@ void ManagePasswordsBubbleView::ShowBubble(content::WebContents* web_contents,
     manage_passwords_bubble_->AdjustForFullscreen(
         browser_view->GetBoundsInScreen());
   }
+
   manage_passwords_bubble_->GetWidget()->Show();
   manage_passwords_bubble_->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
 }
@@ -411,24 +410,18 @@ bool ManagePasswordsBubbleView::IsShowing() {
 
 ManagePasswordsBubbleView::ManagePasswordsBubbleView(
     content::WebContents* web_contents,
-    ManagePasswordsIconView* anchor_view,
+    views::View* anchor_view,
     DisplayReason reason)
     : ManagePasswordsBubble(web_contents, reason),
       BubbleDelegateView(anchor_view,
                          anchor_view ? views::BubbleBorder::TOP_RIGHT
-                                     : views::BubbleBorder::NONE),
-      anchor_view_(anchor_view) {
+                                     : views::BubbleBorder::NONE) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(2, 0, 2, 0));
   set_notify_enter_exit_on_child(true);
-  if (anchor_view)
-    anchor_view->SetActive(true);
 }
 
-ManagePasswordsBubbleView::~ManagePasswordsBubbleView() {
-  if (anchor_view_)
-    anchor_view_->SetActive(false);
-}
+ManagePasswordsBubbleView::~ManagePasswordsBubbleView() {}
 
 void ManagePasswordsBubbleView::AdjustForFullscreen(
     const gfx::Rect& screen_bounds) {