Convert location bar bubble delegates to bubble dialog delegates

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/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 246 matching lines @@
     timer_.Start(FROM_HERE, GetTimeout(), this, &AutoSigninView::OnTimer);
 }
 
 void ManagePasswordsBubbleView::AutoSigninView::OnWidgetClosing(
     views::Widget* widget) {
   observed_browser_.RemoveAll();
 }
 
 void ManagePasswordsBubbleView::AutoSigninView::OnTimer() {
   parent_->model()->OnAutoSignInToastTimeout();
-  parent_->Close();
+  parent_->CloseBubble();
 }
 
 // ManagePasswordsBubbleView::PendingView -------------------------------------
 
 // A view offering the user the ability to save credentials. Contains a
 // single ManagePasswordItemsView, along with a "Save Passwords" button
 // and a "Never" button.
 class ManagePasswordsBubbleView::PendingView
     : public views::View,
       public views::ButtonListener,
@@ skipping 81 matching lines @@
 void ManagePasswordsBubbleView::PendingView::ButtonPressed(
     views::Button* sender,
     const ui::Event& event) {
   if (sender == save_button_)
     parent_->model()->OnSaveClicked();
   else if (sender == never_button_)
     parent_->model()->OnNeverForThisSiteClicked();
   else
     NOTREACHED();
 
-  parent_->Close();
+  parent_->CloseBubble();
 }
 
 void ManagePasswordsBubbleView::PendingView::StyledLabelLinkClicked(
     views::StyledLabel* label,
     const gfx::Range& range,
     int event_flags) {
   DCHECK_EQ(range, parent_->model()->title_brand_link_range());
   parent_->model()->OnBrandLinkClicked();
 }
 
@@ skipping 82 matching lines @@
 }
 
 ManagePasswordsBubbleView::ManageView::~ManageView() {
 }
 
 void ManagePasswordsBubbleView::ManageView::ButtonPressed(
     views::Button* sender,
     const ui::Event& event) {
   DCHECK(sender == done_button_);
   parent_->model()->OnDoneClicked();
-  parent_->Close();
+  parent_->CloseBubble();
 }
 
 void ManagePasswordsBubbleView::ManageView::LinkClicked(views::Link* source,
                                                         int event_flags) {
   DCHECK_EQ(source, manage_link_);
   parent_->model()->OnManageLinkClicked();
-  parent_->Close();
+  parent_->CloseBubble();
 }
 
 // ManagePasswordsBubbleView::SaveConfirmationView ----------------------------
 
 // A view confirming to the user that a password was saved and offering a link
 // to the Google account manager.
 class ManagePasswordsBubbleView::SaveConfirmationView
     : public views::View,
       public views::ButtonListener,
       public views::StyledLabelListener {
@@ skipping 48 matching lines @@
 
 ManagePasswordsBubbleView::SaveConfirmationView::~SaveConfirmationView() {
 }
 
 void ManagePasswordsBubbleView::SaveConfirmationView::StyledLabelLinkClicked(
     views::StyledLabel* label,
     const gfx::Range& range,
     int event_flags) {
   DCHECK_EQ(range, parent_->model()->save_confirmation_link_range());
   parent_->model()->OnManageLinkClicked();
-  parent_->Close();
+  parent_->CloseBubble();
 }
 
 void ManagePasswordsBubbleView::SaveConfirmationView::ButtonPressed(
     views::Button* sender, const ui::Event& event) {
   DCHECK_EQ(sender, ok_button_);
   parent_->model()->OnOKClicked();
-  parent_->Close();
+  parent_->CloseBubble();
 }
 
 // ManagePasswordsBubbleView::WebContentMouseHandler --------------------------
 
 // The class listens for WebContentsView events and notifies the bubble if the
 // view was clicked on or received keystrokes.
 class ManagePasswordsBubbleView::WebContentMouseHandler
     : public ui::EventHandler {
  public:
   explicit WebContentMouseHandler(ManagePasswordsBubbleView* bubble);
@@ skipping 17 matching lines @@
   event_monitor_ = views::EventMonitor::CreateWindowMonitor(
       this, web_contents->GetTopLevelNativeWindow());
 }
 
 void ManagePasswordsBubbleView::WebContentMouseHandler::OnKeyEvent(
     ui::KeyEvent* event) {
   content::WebContents* web_contents = bubble_->web_contents();
   content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
   if ((event->key_code() == ui::VKEY_ESCAPE ||
        rvh->IsFocusedElementEditable()) && event->type() == ui::ET_KEY_PRESSED)
-    bubble_->Close();
+    bubble_->CloseBubble();
 }
 
 void ManagePasswordsBubbleView::WebContentMouseHandler::OnMouseEvent(
     ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED)
-    bubble_->Close();
+    bubble_->CloseBubble();
 }
 
 void ManagePasswordsBubbleView::WebContentMouseHandler::OnTouchEvent(
     ui::TouchEvent* event) {
   if (event->type() == ui::ET_TOUCH_PRESSED)
-    bubble_->Close();
+    bubble_->CloseBubble();
 }
 
 // ManagePasswordsBubbleView::UpdatePendingView -------------------------------
 
 // A view offering the user the ability to update credentials. Contains a
 // single ManagePasswordItemsView (in case of one credentials) or
 // CredentialsSelectionView otherwise, along with a "Update Passwords" button
 // and a rejection button.
 class ManagePasswordsBubbleView::UpdatePendingView
     : public views::View,
@@ skipping 76 matching lines @@
     if (selection_view_) {
       // Multi account case.
       parent_->model()->OnUpdateClicked(
           *selection_view_->GetSelectedCredentials());
     } else {
       parent_->model()->OnUpdateClicked(parent_->model()->pending_password());
     }
   } else {
     parent_->model()->OnNopeUpdateClicked();
   }
-  parent_->Close();
+  parent_->CloseBubble();
 }
 
 void ManagePasswordsBubbleView::UpdatePendingView::StyledLabelLinkClicked(
     views::StyledLabel* label,
     const gfx::Range& range,
     int event_flags) {
   DCHECK_EQ(range, parent_->model()->title_brand_link_range());
   parent_->model()->OnBrandLinkClicked();
 }
 
@@ skipping 19 matching lines @@
       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->GetNativeView());
 
   views::Widget* manage_passwords_bubble_widget =
-      views::BubbleDelegateView::CreateBubble(manage_passwords_bubble_);
+      views::BubbleDialogDelegateView::CreateBubble(manage_passwords_bubble_);
   if (anchor_view)
     manage_passwords_bubble_widget->AddObserver(anchor_view);
 
   // 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_->ShowForReason(reason);
 }
 
 // static
-void ManagePasswordsBubbleView::CloseBubble() {
+void ManagePasswordsBubbleView::CloseCurrentBubble() {
   if (manage_passwords_bubble_)
-    manage_passwords_bubble_->Close();
+    manage_passwords_bubble_->CloseBubble();
 }
 
 // static
 void ManagePasswordsBubbleView::ActivateBubble() {
   DCHECK(manage_passwords_bubble_);
   DCHECK(manage_passwords_bubble_->GetWidget()->IsVisible());
   manage_passwords_bubble_->GetWidget()->Activate();
 }
 
 content::WebContents* ManagePasswordsBubbleView::web_contents() const {
@@ skipping 24 matching lines @@
   return initially_focused_view_;
 }
 
 void ManagePasswordsBubbleView::Init() {
   views::FillLayout* layout = new views::FillLayout();
   SetLayoutManager(layout);
 
   Refresh();
 }
 
-void ManagePasswordsBubbleView::Close() {
+void ManagePasswordsBubbleView::CloseBubble() {
   mouse_handler_.reset();
-  LocationBarBubbleDelegateView::Close();
+  LocationBarBubbleDelegateView::CloseBubble();
 }
 
 base::string16 ManagePasswordsBubbleView::GetWindowTitle() const {
   return model_.title();
 }
 
 bool ManagePasswordsBubbleView::ShouldShowWindowTitle() const {
   // Since bubble titles don't support links, fall back to a custom title view
   // if we need to show a link. Only use the normal title path if there's no
   // link.
@@ skipping 16 matching lines @@
     AddChildView(new SaveConfirmationView(this));
   } else if (model_.state() == password_manager::ui::AUTO_SIGNIN_STATE) {
     AddChildView(new AutoSigninView(this));
   } else {
     AddChildView(new ManageView(this));
   }
   if (GetWidget())
     GetWidget()->UpdateWindowTitle();
   GetLayoutManager()->Layout(this);
 }