Password bubble: ManagePasswordsIconView is now a BubbleIconView.

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 "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"
 #include "ui/gfx/text_utils.h"
@@ skipping 15 matching lines @@
 const int kPasswordFieldSize = 22;
 
 // Returns the width of |type| field.
 int GetFieldWidth(FieldType type) {
   return ui::ResourceBundle::GetSharedInstance()
       .GetFontList(ui::ResourceBundle::SmallFont)
       .GetExpectedTextWidth(type == USERNAME_FIELD ? kUsernameFieldSize
                                                    : kPasswordFieldSize);
 }
 
-class SavePasswordRefusalComboboxModel : public ui::ComboboxModel {
- public:
-  enum { INDEX_NOPE = 0, INDEX_NEVER_FOR_THIS_SITE = 1, };
-
-  SavePasswordRefusalComboboxModel() {
-    items_.push_back(
-        l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_CANCEL_BUTTON));
-    items_.push_back(
-        l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON));
-  }
-  virtual ~SavePasswordRefusalComboboxModel() {}
-
- private:
-  // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE { return items_.size(); }
-  virtual base::string16 GetItemAt(int index) OVERRIDE { return items_[index]; }
-  virtual bool IsItemSeparatorAt(int index) OVERRIDE {
-    return items_[index].empty();
-  }
-  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 168 matching lines @@
     // a "Save" and "Reject" button.
     ManagePasswordItemView* item =
         new ManagePasswordItemView(model(),
                                    model()->pending_credentials(),
                                    first_field_width,
                                    second_field_width,
                                    ManagePasswordItemView::FIRST_ITEM);
     layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
     layout->AddView(item);
 
-    refuse_combobox_ =
-        new views::Combobox(new SavePasswordRefusalComboboxModel());
+    combobox_model_.reset(new SavePasswordRefusalComboboxModel());
+    refuse_combobox_.reset(new views::Combobox(combobox_model_.get()));
     refuse_combobox_->set_listener(this);
     refuse_combobox_->SetStyle(views::Combobox::STYLE_ACTION);
 
     save_button_ = new views::BlueButton(
         this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SAVE_BUTTON));
 
     layout->StartRowWithPadding(
         0, DOUBLE_BUTTON_COLUMN_SET, 0, views::kRelatedControlVerticalSpacing);
     layout->AddView(save_button_);
-    layout->AddView(refuse_combobox_);
+    layout->AddView(refuse_combobox_.get());
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   } else {
     // If we have a list of passwords to store for the current site, display
     // them to the user for management. Otherwise, render a "No passwords for
     // this site" message.
     //
     // TODO(mkwst): Do we really want the "No passwords" case? It would probably
     // be better to only clear the pending password upon navigation, rather than
     // as soon as the bubble closes.
     if (!model()->best_matches().empty()) {
@@ skipping 74 matching lines @@
       break;
     case SavePasswordRefusalComboboxModel::INDEX_NEVER_FOR_THIS_SITE:
       model()->OnNeverForThisSiteClicked();
       break;
     default:
       NOTREACHED();
       break;
   }
   Close();
 }