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

chrome/browser/ui/views/passwords/manage_passwords_bubble_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_bubble_view.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 355 matching lines @@
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   DCHECK(browser);
   DCHECK(browser->window());
   DCHECK(browser->fullscreen_controller());
 
   if (IsShowing())
     return;
 
   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);
 
   if (is_fullscreen) {
     manage_passwords_bubble_->set_parent_window(
         web_contents->GetTopLevelNativeWindow());
   }
 
   views::BubbleDelegateView::CreateBubble(manage_passwords_bubble_);
 
   // Adjust for fullscreen after creation as it relies on the content size.
   if (is_fullscreen) {
     manage_passwords_bubble_->AdjustForFullscreen(
         browser_view->GetBoundsInScreen());
   }
+
   manage_passwords_bubble_->GetWidget()->Show();
   manage_passwords_bubble_->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
 }
 
 // static
 void ManagePasswordsBubbleView::CloseBubble() {
   if (manage_passwords_bubble_)
     manage_passwords_bubble_->Close();
 }
 
 // static
 bool ManagePasswordsBubbleView::IsShowing() {
   // The bubble may be in the process of closing.
   return (manage_passwords_bubble_ != NULL) &&
       manage_passwords_bubble_->GetWidget()->IsVisible();
 }
 
 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) {
   if (GetAnchorView())
     return;
 
   // The bubble's padding from the screen edge, used in fullscreen.
   const int kFullscreenPaddingEnd = 20;
   const size_t bubble_half_width = width() / 2;
   const int x_pos = base::i18n::IsRTL() ?
@@ skipping 18 matching lines @@
   else
     AddChildView(new ManageView(this));
 }
 
 void ManagePasswordsBubbleView::WindowClosing() {
   // Close() closes the window asynchronously, so by the time we reach here,
   // |manage_passwords_bubble_| may have already been reset.
   if (manage_passwords_bubble_ == this)
     manage_passwords_bubble_ = NULL;
 }