rollback

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5933 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 90 insertions, 97 deletions

diff --git a/chrome/browser/password_manager.cc b/chrome/browser/password_manager.cc
index 7b675d6..f046773 100644
--- a/chrome/browser/password_manager.cc
+++ b/chrome/browser/password_manager.cc
@@ -25,6 +25,7 @@ void PasswordManager::RegisterUserPrefs(PrefService* prefs) {
 
 PasswordManager::PasswordManager(WebContents* web_contents)
     : web_contents_(web_contents),
+      current_bar_(NULL),
       observer_(NULL),
       login_managers_deleter_(&pending_login_managers_) {
   password_manager_enabled_.Init(prefs::kPasswordManagerEnabled,
@@ -32,8 +33,7 @@ PasswordManager::PasswordManager(WebContents* web_contents)
 }
 
 PasswordManager::~PasswordManager() {
-  // Remove any InfoBars we may be showing.
-  web_contents_->RemoveInfoBar(this);
+  CloseBars();
 }
 
 void PasswordManager::ProvisionallySavePassword(PasswordForm form) {
@@ -112,7 +112,8 @@ void PasswordManager::DidStopLoading() {
     return;
 
   if (pending_save_manager_->IsNewLogin()) {
-    web_contents_->AddInfoBar(this);
+    // Transfer ownership of the pending_save_manager_ to the PasswordBar.
+    ReplaceInfoBar(new SavePasswordBar(pending_save_manager_.release(), this));
   } else {
     // If the save is not a new username entry, then we just want to save this
     // data (since the user already has related data saved), so don't prompt.
@@ -181,41 +182,45 @@ void PasswordManager::Autofill(const PasswordForm& form_for_autofill,
   }
 }
 
-// PasswordManager, ConfirmInfoBarDelegate implementation: ---------------------
-
-void PasswordManager::InfoBarClosed() {
-  pending_save_manager_.reset(NULL);
-}
-
-std::wstring PasswordManager::GetMessageText() const {
-  return l10n_util::GetString(IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT);
+void PasswordManager::CloseBars() {
+  if (current_bar_)
+    current_bar_->Close();
 }
 
-SkBitmap* PasswordManager::GetIcon() const {
-  return ResourceBundle::GetSharedInstance().GetBitmapNamed(
-      IDR_INFOBAR_SAVE_PASSWORD);
+void PasswordManager::ReplaceInfoBar(InfoBarItemView* bar) {
+  // TODO(brettw) The password manager should not have to know about info bars.
+  CloseBars();
+  InfoBarView* view = web_contents_->view()->GetInfoBarView();
+  view->AddChildView(bar);
+  current_bar_ = bar;
 }
 
-int PasswordManager::GetButtons() const {
-  return BUTTON_OK | BUTTON_CANCEL;
+PasswordManager::SavePasswordBar
+               ::SavePasswordBar(PasswordFormManager* form_manager,
+                                 PasswordManager* password_manager)
+    : form_manager_(form_manager),
+      password_manager_(password_manager),
+      InfoBarConfirmView(
+          l10n_util::GetString(IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT)) {
+  SetOKButtonLabel(l10n_util::GetString(IDS_PASSWORD_MANAGER_SAVE_BUTTON));
+  SetCancelButtonLabel(l10n_util::GetString(
+      IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON));
+  ResourceBundle &rb = ResourceBundle::GetSharedInstance();
+  SetIcon(*rb.GetBitmapNamed(IDR_INFOBAR_SAVE_PASSWORD));
 }
 
-std::wstring PasswordManager::GetButtonLabel(InfoBarButton button) const {
-  if (button == BUTTON_OK)
-    return l10n_util::GetString(IDS_PASSWORD_MANAGER_SAVE_BUTTON);
-  if (button == BUTTON_CANCEL)
-    return l10n_util::GetString(IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON);
-  NOTREACHED();
-  return std::wstring();
+PasswordManager::SavePasswordBar::~SavePasswordBar() {
+  password_manager_->current_bar_ = NULL;
+  if (form_manager_)
+    delete form_manager_;
 }
 
-void PasswordManager::Accept() {
-  pending_save_manager_->Save();
-  web_contents_->RemoveInfoBar(this);
+void PasswordManager::SavePasswordBar::OKButtonPressed() {
+  form_manager_->Save();
+  BeginClose();
 }
 
-void PasswordManager::Cancel() {
-  pending_save_manager_->PermanentlyBlacklist();
-  web_contents_->RemoveInfoBar(this);
+void PasswordManager::SavePasswordBar::CancelButtonPressed() {
+  form_manager_->PermanentlyBlacklist();
+  BeginClose();
 }
-
diff --git a/chrome/browser/password_manager.h b/chrome/browser/password_manager.h
index 584ffff..ecdac61 100644
--- a/chrome/browser/password_manager.h
+++ b/chrome/browser/password_manager.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_PASSWORD_MANAGER_H__
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/infobar_delegate.h"
+#include "chrome/browser/views/info_bar_confirm_view.h"
 #include "chrome/browser/password_form_manager.h"
 #include "chrome/browser/views/login_view.h"
 #include "chrome/common/pref_member.h"
@@ -21,8 +21,7 @@ class WebContents;
 // receiving password form data from the renderer and managing the password
 // database through the WebDataService. The PasswordManager is a LoginModel
 // for purposes of supporting HTTP authentication dialogs.
-class PasswordManager : public views::LoginModel,
-                        public ConfirmInfoBarDelegate {
+class PasswordManager : public views::LoginModel {
  public:
   static void RegisterUserPrefs(PrefService* prefs);
 
@@ -35,6 +34,9 @@ class PasswordManager : public views::LoginModel,
                 const PasswordFormMap& best_matches,
                 const PasswordForm* const preferred_match) const;
 
+  // Closes any visible password manager UI
+  void CloseBars();
+
   // Notification that the user navigated away from the current page. 
   // Unless this is a password form submission, for our purposes this
   // means we're done with the current page, so we can clean-up.
@@ -61,15 +63,32 @@ class PasswordManager : public views::LoginModel,
   }
 
  private:
-  // Overridden from ConfirmInfoBarDelegate:
-  virtual void InfoBarClosed();
-  virtual std::wstring GetMessageText() const;
-  virtual SkBitmap* GetIcon() const;
-  virtual int GetButtons() const;
-  virtual std::wstring GetButtonLabel(InfoBarButton button) const;
-  virtual void Accept();
-  virtual void Cancel();
-  
+  // The Info Bar UI that prompts the user to save a password.
+  friend class SavePasswordBar;
+  class SavePasswordBar : public InfoBarConfirmView {
+   public:
+    SavePasswordBar(PasswordFormManager* form_manager,
+                    PasswordManager* password_manager);
+    virtual ~SavePasswordBar();
+
+    // InfoBarConfirmView overrides.
+    virtual void OKButtonPressed();
+    virtual void CancelButtonPressed();
+
+   private:
+    PasswordFormManager* form_manager_;
+    PasswordManager* password_manager_;
+
+    DISALLOW_EVIL_CONSTRUCTORS(SavePasswordBar);
+  };
+
+  // Replace the current InfoBar with a new one. Just adds if there is no
+  // visible InfoBars.
+  void ReplaceInfoBar(InfoBarItemView* view);
+
+  // The currently visible InfoBar (NULL if none)
+  InfoBarItemView* current_bar_;
+
   // When a form is "seen" on a page, a PasswordFormManager is created
   // and stored in this collection until user navigates away from page.
   typedef std::vector<PasswordFormManager*> LoginManagers;
diff --git a/chrome/browser/tab_contents.cc b/chrome/browser/tab_contents.cc
index 20aa67b..510c611 100644
--- a/chrome/browser/tab_contents.cc
+++ b/chrome/browser/tab_contents.cc
@@ -390,7 +390,7 @@ void TabContents::SetInitialFocus() {
 void TabContents::AddInfoBar(InfoBarDelegate* delegate) {
   // Look through the existing InfoBarDelegates we have for a match. If we've
   // already got one that matches, then we don't add the new one.
-  for (int i = 0; i < infobar_delegate_count(); ++i) {
+  for (size_t i = 0; i < infobar_delegate_count(); ++i) {
     if (GetInfoBarDelegateAt(i)->EqualsDelegate(delegate))
       return;
   }
@@ -415,10 +415,10 @@ void TabContents::RemoveInfoBar(InfoBarDelegate* delegate) {
       find(infobar_delegates_.begin(), infobar_delegates_.end(), delegate);
   if (it != infobar_delegates_.end()) {
     InfoBarDelegate* delegate = *it;
+    infobar_delegates_.erase(it);
     NotificationService::current()->Notify(NOTIFY_TAB_CONTENTS_INFOBAR_REMOVED,
                                            Source<TabContents>(this),
                                            Details<InfoBarDelegate>(delegate));
-    infobar_delegates_.erase(it);
   }
 
   // Remove ourselves as an observer if we are tracking no more InfoBars.
@@ -590,9 +590,11 @@ void TabContents::ExpireInfoBars(
   if (!details.is_user_initiated_main_frame_load())
     return;
 
-  for (int i = infobar_delegate_count() - 1; i >= 0; --i) {
+  for (size_t i = 0; i < infobar_delegate_count(); ++i) {
     InfoBarDelegate* delegate = GetInfoBarDelegateAt(i);
-    if (delegate->ShouldCloseOnNavigate())
+    if (!TransitionIsReload(details.entry->transition_type()) &&      
+        delegate->ShouldCloseOnNavigate()) {
       RemoveInfoBar(delegate);
+    }
   }
 }
diff --git a/chrome/browser/tab_contents.h b/chrome/browser/tab_contents.h
index 2f78a79..6893ee1 100644
--- a/chrome/browser/tab_contents.h
+++ b/chrome/browser/tab_contents.h
@@ -393,8 +393,8 @@ class TabContents : public PageNavigator,
   void RemoveInfoBar(InfoBarDelegate* delegate);
   
   // Enumeration and access functions.
-  int infobar_delegate_count() const { return infobar_delegates_.size(); }
-  InfoBarDelegate* GetInfoBarDelegateAt(int index) {
+  size_t infobar_delegate_count() const { return infobar_delegates_.size(); }
+  InfoBarDelegate* GetInfoBarDelegateAt(size_t index) {
     return infobar_delegates_.at(index);
   }
 
diff --git a/chrome/browser/views/infobars/infobar_container.cc b/chrome/browser/views/infobars/infobar_container.cc
index bb48b12..2fe7a35 100644
--- a/chrome/browser/views/infobars/infobar_container.cc
+++ b/chrome/browser/views/infobars/infobar_container.cc
@@ -103,7 +103,7 @@ void InfoBarContainer::UpdateInfoBars() {
   // Clear out all the old child views.
   RemoveAllChildViews(true);
 
-  for (int i = 0; i < tab_contents_->infobar_delegate_count(); ++i) {
+  for (size_t i = 0; i < tab_contents_->infobar_delegate_count(); ++i) {
     InfoBarDelegate* delegate = tab_contents_->GetInfoBarDelegateAt(i);
     InfoBar* infobar = delegate->CreateInfoBar();
     infobar->set_container(this);
@@ -120,7 +120,7 @@ void InfoBarContainer::AddInfoBar(InfoBarDelegate* delegate) {
 }
 
 void InfoBarContainer::RemoveInfoBar(InfoBarDelegate* delegate) {
-  int index = 0;
+  size_t index = 0;
   for (; index < tab_contents_->infobar_delegate_count(); ++index) {
     if (tab_contents_->GetInfoBarDelegateAt(index) == delegate)
       break;
diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc
index c9b6f2e..5733d33 100644
--- a/chrome/browser/views/infobars/infobars.cc
+++ b/chrome/browser/views/infobars/infobars.cc
@@ -11,10 +11,8 @@
 #include "chrome/common/slide_animation.h"
 #include "chrome/views/background.h"
 #include "chrome/views/button.h"
-#include "chrome/views/external_focus_tracker.h"
 #include "chrome/views/image_view.h"
 #include "chrome/views/label.h"
-#include "chrome/views/widget.h"
 
 #include "generated_resources.h"
 
@@ -104,8 +102,6 @@ void InfoBar::AnimateClose() {
 
 void InfoBar::Close() {
   GetParent()->RemoveChildView(this);
-  if (focus_tracker_.get())
-    focus_tracker_->FocusLastFocusedExternalView();
   if (delegate())
     delegate()->InfoBarClosed();
   delete this;
@@ -126,25 +122,6 @@ void InfoBar::Layout() {
 
 }
 
-void InfoBar::ViewHierarchyChanged(bool is_add, views::View* parent,
-                                   views::View* child) {
-  if (child == this) {
-    views::Widget* widget = GetWidget();
-    if (is_add && widget) {
-      // When we're added to a view hierarchy within a widget, we create an
-      // external focus tracker to track what was focused in case we obtain
-      // focus so that we can restore focus when we're removed.
-      focus_tracker_.reset(
-          new views::ExternalFocusTracker(this,
-              views::FocusManager::GetFocusManager(widget->GetHWND())));
-    } else if (focus_tracker_.get()) {
-      // When we're removed from a view hierarchy, our focus manager is no
-      // longer valid.
-      focus_tracker_->SetFocusManager(NULL);
-    }
-  }
-}
-
 // InfoBar, protected: ---------------------------------------------------------
 
 int InfoBar::GetAvailableWidth() const {
@@ -222,12 +199,6 @@ ConfirmInfoBar::ConfirmInfoBar(ConfirmInfoBarDelegate* delegate)
       cancel_button_(NULL),
       initialized_(false),
       AlertInfoBar(delegate) {
-  ok_button_ = new views::NativeButton(
-      delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
-  ok_button_->SetListener(this);
-  cancel_button_ = new views::NativeButton(
-      delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL));
-  cancel_button_->SetListener(this);
 }
 
 ConfirmInfoBar::~ConfirmInfoBar() {
@@ -261,7 +232,6 @@ void ConfirmInfoBar::Layout() {
 void ConfirmInfoBar::ViewHierarchyChanged(bool is_add,
                                           views::View* parent,
                                           views::View* child) {
-  InfoBar::ViewHierarchyChanged(is_add, parent, child);
   if (is_add && child == this && !initialized_) {
     Init();
     initialized_ = true;
@@ -297,7 +267,14 @@ ConfirmInfoBarDelegate* ConfirmInfoBar::GetDelegate() {
 }
 
 void ConfirmInfoBar::Init() {
+  ok_button_ = new views::NativeButton(
+      GetDelegate()->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
+  ok_button_->SetListener(this);
   AddChildView(ok_button_);
+
+  cancel_button_ = new views::NativeButton(
+      GetDelegate()->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL));
+  cancel_button_->SetListener(this);
   AddChildView(cancel_button_);
 }
 
diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
index 7b94735..1e02f96 100644
--- a/chrome/browser/views/infobars/infobars.h
+++ b/chrome/browser/views/infobars/infobars.h
@@ -13,7 +13,6 @@ class InfoBarContainer;
 class SlideAnimation;
 namespace views {
 class Button;
-class ExternalFocusTracker;
 class ImageView;
 class Label;
 }
@@ -53,11 +52,6 @@ class InfoBar : public views::View,
   virtual void Layout();
 
  protected:
-  // Overridden from views::View:
-  virtual void ViewHierarchyChanged(bool is_add,
-                                    views::View* parent,
-                                    views::View* child);
-
   // Returns the available width of the View for use by child view layout,
   // excluding the close button.
   virtual int GetAvailableWidth() const;
@@ -82,10 +76,6 @@ class InfoBar : public views::View,
   // The animation that runs when the InfoBar is opened or closed.
   scoped_ptr<SlideAnimation> animation_;
 
-  // Tracks and stores the last focused view which is not the InfoBar or any of
-  // its children. Used to restore focus once the InfoBar is closed.
-  scoped_ptr<views::ExternalFocusTracker> focus_tracker_;
-
   DISALLOW_COPY_AND_ASSIGN(InfoBar);
 };
 
diff --git a/chrome/common/notification_types.h b/chrome/common/notification_types.h
index d6ca458..c748d36 100644
--- a/chrome/common/notification_types.h
+++ b/chrome/common/notification_types.h
@@ -200,18 +200,18 @@ enum NotificationType {
   // No details are expected.
   NOTIFY_WEB_CONTENTS_DISCONNECTED,
 
-  // This message is sent when a new InfoBar has been added to a TabContents.
-  // The source is a Source<TabContents> with a pointer to the TabContents the
+  // This message is sent when a new InfoBar is added to a TabContents. The
+  // source is a Source<TabContents> with a pointer to the TabContents the
   // InfoBar was added to. The details is a Details<InfoBarDelegate> with a
   // pointer to an object implementing the InfoBarDelegate interface for the
   // InfoBar that was added.
   NOTIFY_TAB_CONTENTS_INFOBAR_ADDED,
 
-  // This message is sent when an InfoBar is about to be removed from a
-  // TabContents. The source is a Source<TabContents> with a pointer to the
-  // TabContents the InfoBar was removed from. The details is a
-  // Details<InfoBarDelegate> with a pointer to an object implementing the
-  // InfoBarDelegate interface for the InfoBar that was removed.
+  // This message is sent when an InfoBar is removed from a TabContents. The
+  // source is a Source<TabContents> with a pointer to the TabContents the
+  // InfoBar was removed from. The details is a Details<InfoBarDelegate> with a
+  // pointer to an object implementing the InfoBarDelegate interface for the
+  // InfoBar that was removed.
   NOTIFY_TAB_CONTENTS_INFOBAR_REMOVED,
 
   // This is sent when an externally hosted tab is created. The details contain