Password bubble: ManagePasswordsIconView is now a BubbleIconView.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_VIEW_H_
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble.h"
+#include "chrome/browser/ui/views/passwords/save_password_refusal_combobox_model.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 
 class ManagePasswordsIconView;
 
 namespace content {
@@ skipping 79 matching lines @@
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   // Handles the event when the user changes an index of a combobox.
   virtual void OnPerformAction(views::Combobox* source) OVERRIDE;
 
   // Singleton instance of the Password bubble. The Password bubble can only be
   // shown on the active browser window, so there is no case in which it will be
   // shown twice at the same time.
   static ManagePasswordsBubbleView* manage_passwords_bubble_;
 
-  // The buttons that are shown in the bubble.
+  // The views that are shown in the bubble.
   views::BlueButton* save_button_;
-  views::Combobox* refuse_combobox_;
-
   views::Link* manage_link_;
   views::LabelButton* done_button_;
 
+  // The combobox doesn't take ownership of it's model. If we created a combobox
+  // we need to ensure that we delete the model here, and because the combobox
+  // uses the model in it's destructor, we need to make sure we delete the model
+  // _after_ the combobox itself is deleted.
+  scoped_ptr<SavePasswordRefusalComboboxModel> combobox_model_;
+  scoped_ptr<views::Combobox> refuse_combobox_;
+
   DISALLOW_COPY_AND_ASSIGN(ManagePasswordsBubbleView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_VIEW_H_