Re-land r5882 with a crash fix.

http://codereview.chromium.org/11559


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

1 files changed, 10 insertions, 0 deletions

diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
index 1e02f96..7b94735 100644
--- a/chrome/browser/views/infobars/infobars.h
+++ b/chrome/browser/views/infobars/infobars.h
@@ -13,6 +13,7 @@ class InfoBarContainer;
 class SlideAnimation;
 namespace views {
 class Button;
+class ExternalFocusTracker;
 class ImageView;
 class Label;
 }
@@ -52,6 +53,11 @@ 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;
@@ -76,6 +82,10 @@ 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);
 };