Password bubble: Introduce a command to open the bubble.

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 "base/metrics/histogram.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"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h"
+#include "chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/passwords/manage_password_item_view.h"
 #include "chrome/browser/ui/views/passwords/manage_passwords_icon_view.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 45 matching lines @@
   virtual int GetDefaultIndex() const OVERRIDE { return 0; }
 
   std::vector<base::string16> items_;
 
   DISALLOW_COPY_AND_ASSIGN(SavePasswordRefusalComboboxModel);
 };
 
 }  // namespace
 
 
+// Globals --------------------------------------------------------------------
+
+namespace chrome {
+
+void ShowManagePasswordsBubble(content::WebContents* web_contents) {
+  ManagePasswordsBubbleUIController* controller =
+      ManagePasswordsBubbleUIController::FromWebContents(web_contents);
+  ManagePasswordsBubbleView::ShowBubble(
+      web_contents,
+      controller->manage_passwords_bubble_needs_showing() ?
+          ManagePasswordsBubbleView::AUTOMATIC :
+          ManagePasswordsBubbleView::USER_ACTION);
+}
+
+}  // namespace chrome
+
+
 // ManagePasswordsBubbleView --------------------------------------------------
 
 // static
 ManagePasswordsBubbleView* ManagePasswordsBubbleView::manage_passwords_bubble_ =
     NULL;
 
 // static
 void ManagePasswordsBubbleView::ShowBubble(content::WebContents* web_contents,
                                            DisplayReason reason) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
@@ skipping 46 matching lines @@
     DisplayReason reason)
     : ManagePasswordsBubble(web_contents, reason),
       BubbleDelegateView(anchor_view,
                          anchor_view ? views::BubbleBorder::TOP_RIGHT
                                      : views::BubbleBorder::NONE) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(5, 0, 5, 0));
   set_notify_enter_exit_on_child(true);
 }
 
-ManagePasswordsBubbleView::~ManagePasswordsBubbleView() {}
+ManagePasswordsBubbleView::~ManagePasswordsBubbleView() {
+  // The combobox doesn't take ownership of it's model. If we created a combobox

[vabr (Chromium), 2014/04/30 07:56:07]

The explanation in the comment is very helpful.
However, please use scoped_ptr instead of this deleting in the destructor. More
precisely,
1) Change the type of |refuse_combobox_| from a raw pointer to a scoped pointer.
2) Add a member variable scoped_ptr for the model, declared just before the
|refuse_combobox_|, and move this comment before the two declarations, to
emphasise the importance of their order.
3) In the constructor's initializer list, simply create the model in it's
scoped_ptr, and then use that to create the combobox in its scoped_ptr.

+  // 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.
+  if (refuse_combobox_) {
+    SavePasswordRefusalComboboxModel* model =
+        static_cast<SavePasswordRefusalComboboxModel*>(
+            refuse_combobox_->model());
+    delete refuse_combobox_;
+    delete model;
+  }
+}
 
 void ManagePasswordsBubbleView::BuildColumnSet(views::GridLayout* layout,
                                                ColumnSetType type) {
   views::ColumnSet* column_set = layout->AddColumnSet(type);
   column_set->AddPaddingColumn(0, views::kPanelHorizMargin);
   switch (type) {
     case SINGLE_VIEW_COLUMN_SET:
       column_set->AddColumn(views::GridLayout::FILL,
                             views::GridLayout::FILL,
                             0,
@@ skipping 207 matching lines @@
       break;
     case SavePasswordRefusalComboboxModel::INDEX_NEVER_FOR_THIS_SITE:
       model()->OnNeverForThisSiteClicked();
       break;
     default:
       NOTREACHED();
       break;
   }
   Close();
 }